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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 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.
…		…
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
…		…
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 > -nsaved && 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
…		…
1205		1204
1206	#ifdef POINTER_BLANK	1205	#ifdef POINTER_BLANK
1207	void	1206	void
1208	rxvt_term::pointer_blank ()	1207	rxvt_term::pointer_blank ()
1209	{	1208	{
1210	if (! OPTION (Opt_pointerBlank))	1209	if (!OPTION (Opt_pointerBlank))
1211	return;	1210	return;
1212		1211
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1212	XDefineCursor (display->display, vt, display->blank_cursor);
1214	XFlush (display->display);	1213	XFlush (display->display);
1215		1214
…		…
1312	dDisp;	1311	dDisp;
1313		1312
1314	SET_R (this);	1313	SET_R (this);
1315	SET_LOCALE (locale);	1314	SET_LOCALE (locale);
1316		1315
1317	#if defined(CURSOR_BLINK)	1316	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1317	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1319	{	1318	return;
1320	if (hidden_cursor)
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1319
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1320	// for XQueryPointer
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;	1321	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1322	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1323	unsigned int unused_mask;
1347		1324
1348	switch (ev.type)	1325	switch (ev.type)
…		…
1355		1332
1356	break;	1333	break;
1357		1334
1358	case KeyRelease:	1335	case KeyRelease:
1359	{	1336	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1337	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1338	KeySym keysym;
1362		1339
1363	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 :/
1364	#endif	1341	#endif
1365		1342
1366	#if ENABLE_FRILLS \|\| ISO_14755	1343	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1344	// ISO 14755 support
1368	if (iso14755buf)	1345	if (iso14755buf)
…		…
1373	# endif	1350	# endif
1374	# if ISO_14755	1351	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1352	// iso14755 part 5.2 handling: release time
1376	// first: controls	1353	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1354	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1355	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1356	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1357	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1358	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1359	commit_iso14755 ();
1383	return; // case-break;	1360	goto skip_switch;
1384	}	1361	}
1385		1362
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1363	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1364	if (i[0] == keysym)
1388	{	1365	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1366	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1367	commit_iso14755 ();
1391	return; // case-break;	1368	goto skip_switch;
1392	}	1369	}
1393		1370
1394	scr_bell ();	1371	scr_bell ();
1395	# endif	1372	# endif
1396	iso14755buf = 0;	1373	iso14755buf = 0;
…		…
1415	else	1392	else
1416	iso14755buf = 0;	1393	iso14755buf = 0;
1417	}	1394	}
1418	#endif	1395	#endif
1419		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
1420	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1401	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421	if (!(ev.xkey.state & ControlMask))	1402	if (!(ev.xkey.state & ControlMask))
1422	slip_wheel_ev.stop ();	1403	slip_wheel_ev.stop ();
1423	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1404	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1424	mouse_slip_wheel_speed = 0;	1405	mouse_slip_wheel_speed = 0;
1425	#endif	1406	#endif
1426	break;	1407	break;
1427	}	1408	}
1428		1409
…		…
1558		1539
1559	case SelectionRequest:	1540	case SelectionRequest:
1560	selection_send (ev.xselectionrequest);	1541	selection_send (ev.xselectionrequest);
1561	break;	1542	break;
1562		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
1563	case UnmapNotify:	1552	case UnmapNotify:
1564	mapped = 0;	1553	mapped = 0;
1565	#ifdef TEXT_BLINK	1554	#ifdef TEXT_BLINK
1566	text_blink_ev.stop ();	1555	text_blink_ev.stop ();
1567	#endif	1556	#endif
1568	break;	1557	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1569
1570	case MapNotify:
1571	mapped = 1;
1572	#ifdef TEXT_BLINK
1573	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574	#endif
1575	break;	1558	break;
1576		1559
1577	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1578	case ReparentNotify:	1561	case ReparentNotify:
1579	rootwin_cb (ev);	1562	rootwin_cb (ev);
…		…
1593		1576
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1577	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1595	scr_expose (ev.xexpose.x, ev.xexpose.y,	1578	scr_expose (ev.xexpose.x, ev.xexpose.y,
1596	ev.xexpose.width, ev.xexpose.height, False);	1579	ev.xexpose.width, ev.xexpose.height, False);
1597		1580
1598	scr_refresh (refresh_type);	1581	want_refresh = 1;
1599	}	1582	}
1600	else	1583	else
1601	{	1584	{
1602	XEvent unused_event;	1585	XEvent unused_event;
1603		1586
…		…
1622	#endif	1605	#endif
1623	}	1606	}
1624	break;	1607	break;
1625		1608
1626	case MotionNotify:	1609	case MotionNotify:
		1610	printf ("motion notify\n");//D
1627	#ifdef POINTER_BLANK	1611	#ifdef POINTER_BLANK
1628	if (hidden_pointer)	1612	if (hidden_pointer)
1629	pointer_unblank ();	1613	pointer_unblank ();
1630	#endif	1614	#endif
1631	#if MENUBAR	1615	#if MENUBAR
…		…
1730	&unused_root_x, &unused_root_y,	1714	&unused_root_x, &unused_root_y,
1731	&ev.xbutton.x, &ev.xbutton.y,	1715	&ev.xbutton.x, &ev.xbutton.y,
1732	&unused_mask);	1716	&unused_mask);
1733	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1717	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734	scrollbar_size ());	1718	scrollbar_size ());
1735	scr_refresh (refresh_type);	1719	want_refresh = 1;
1736	refresh_limit = 0;	1720	refresh_limit = 0;
1737	scrollbar_show (1);	1721	scrollbar_show (1);
1738	}	1722	}
1739	break;	1723	break;
1740	}	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
1741	}	1754	}
1742		1755
1743	void	1756	void
1744	rxvt_term::focus_in ()	1757	rxvt_term::focus_in ()
1745	{	1758	{
…		…
1870	#ifdef MOUSE_REPORT_DOUBLECLICK	1883	#ifdef MOUSE_REPORT_DOUBLECLICK
1871	if (ev.button == MEvent.button && clickintime)	1884	if (ev.button == MEvent.button && clickintime)
1872	{	1885	{
1873	/* same button, within alloted time */	1886	/* same button, within alloted time */
1874	MEvent.clicks++;	1887	MEvent.clicks++;
		1888
1875	if (MEvent.clicks > 1)	1889	if (MEvent.clicks > 1)
1876	{	1890	{
1877	/* only report double clicks */	1891	/* only report double clicks */
1878	MEvent.clicks = 2;	1892	MEvent.clicks = 2;
1879	mouse_report (ev);	1893	mouse_report (ev);
…		…
1912	#else	1926	#else
1913	selection.rect = false;	1927	selection.rect = false;
1914	#endif	1928	#endif
1915		1929
1916	/* allow shift+left click to extend selection */	1930	/* allow shift+left click to extend selection */
1917	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1931	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1918	{	1932	{
1919	if (MEvent.button == Button1 && clickintime)	1933	if (MEvent.button == Button1 && clickintime)
1920	selection_rotate (ev.x, ev.y);	1934	selection_rotate (ev.x, ev.y);
1921	else	1935	else
1922	selection_extend (ev.x, ev.y, 1);	1936	selection_extend (ev.x, ev.y, 1);
…		…
2087	}	2101	}
2088		2102
2089	break;	2103	break;
2090	}	2104	}
2091	}	2105	}
		2106
2092	return;	2107	return;
2093	}	2108	}
		2109
2094	#if MENUBAR	2110	#if MENUBAR
2095	/*	2111	/*
2096	* Menubar window processing of button press	2112	* Menubar window processing of button press
2097	*/	2113	*/
2098	if (isMenuBarWindow (ev.window))	2114	if (isMenuBarWindow (ev.window))
…		…
2161	if (priv_modes & PrivMode_mouse_report	2177	if (priv_modes & PrivMode_mouse_report
2162	&& bypass_keystate	2178	&& bypass_keystate
2163	&& ev.button == Button1 && MEvent.clicks <= 1)	2179	&& ev.button == Button1 && MEvent.clicks <= 1)
2164	selection_extend (ev.x, ev.y, 0);	2180	selection_extend (ev.x, ev.y, 0);
2165		2181
2166	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2182	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167	return;	2183	return;
2168		2184
2169	switch (ev.button)	2185	switch (ev.button)
2170	{	2186	{
2171	case Button1:	2187	case Button1:
…		…
2204	slip_wheel_ev.start ();	2220	slip_wheel_ev.start ();
2205	}	2221	}
2206	else	2222	else
2207	{	2223	{
2208	# endif	2224	# endif
2209	# ifdef JUMP_MOUSE_WHEEL
2210	scr_page (v, i);	2225	scr_page (v, i);
2211	scr_refresh (SMOOTH_REFRESH);
2212	scrollbar_show (1);	2226	scrollbar_show (1);
2213	# else
2214	while (i--)
2215	{
2216	scr_page (v, 1);
2217	scr_refresh (SMOOTH_REFRESH);
2218	scrollbar_show (1);
2219	}
2220	# endif
2221	# ifdef MOUSE_SLIP_WHEELING	2227	# ifdef MOUSE_SLIP_WHEELING
2222	}	2228	}
2223	#endif	2229	# endif
2224	}	2230	}
2225	break;	2231	break;
2226	#endif	2232	#endif
2227	}	2233	}
2228	}	2234	}
…		…
2717		2723
2718	bool	2724	bool
2719	rxvt_term::cmd_parse ()	2725	rxvt_term::cmd_parse ()
2720	{	2726	{
2721	bool flag = false;	2727	bool flag = false;
2722	unicode_t ch = NOCHAR;	2728	wchar_t ch = NOCHAR;
2723	char *seq_begin; // remember start of esc-sequence here	2729	char *seq_begin; // remember start of esc-sequence here
2724		2730
2725	for (;;)	2731	for (;;)
2726	{	2732	{
2727	if (ch == NOCHAR)	2733	if (ch == NOCHAR)
…		…
2748	if (seen_resize && cmd_pid)	2754	if (seen_resize && cmd_pid)
2749	kill (-cmd_pid, SIGWINCH);	2755	kill (-cmd_pid, SIGWINCH);
2750	}	2756	}
2751		2757
2752	/* Read a text string from the input buffer */	2758	/* Read a text string from the input buffer */
2753	unicode_t buf[UBUFSIZ];	2759	wchar_t buf[UBUFSIZ];
2754	bool refreshnow = false;	2760	bool refreshnow = false;
2755	int nlines = 0;	2761	int nlines = 0;
2756	unicode_t *str = buf;	2762	wchar_t *str = buf;
2757	unicode_t *eol = str + min (ncol, UBUFSIZ);	2763	wchar_t *eol = str + min (ncol, UBUFSIZ);
2758		2764
2759	for (;;)	2765	for (;;)
2760	{	2766	{
2761	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))
2762	break;	2768	break;
…		…
2780	}	2786	}
2781		2787
2782	// scr_add_lines only works for nlines <= nrow - 1.	2788	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2789	if (nlines >= nrow - 1)
2784	{	2790	{
2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2791	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2786	scr_add_lines (buf, nlines, str - buf);	2792	scr_add_lines (buf, str - buf, nlines);
2787		2793
2788	nlines = 0;	2794	nlines = 0;
2789	str = buf;	2795	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2796	eol = str + min (ncol, UBUFSIZ);
2791	}	2797	}
…		…
2805		2811
2806	seq_begin = cmdbuf_ptr;	2812	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2813	ch = next_char ();
2808	}	2814	}
2809		2815
2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2816	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2811	scr_add_lines (buf, nlines, str - buf);	2817	scr_add_lines (buf, str - buf, nlines);
2812		2818
2813	/*	2819	/*
2814	* 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
2815	* 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.
2816	* the number of pages between refreshes is refresh_limit, which	2822	* the number of pages between refreshes is refresh_limit, which
…		…
2822	refresh_limit++;	2828	refresh_limit++;
2823	else	2829	else
2824	{	2830	{
2825	flag = true;	2831	flag = true;
2826	scr_refresh (refresh_type);	2832	scr_refresh (refresh_type);
2827	flush_ev.stop ();	2833	want_refresh = 1;
2828	}	2834	}
2829	}	2835	}
2830		2836
2831	}	2837	}
2832	else	2838	else
…		…
2847	}	2853	}
2848		2854
2849	return flag;	2855	return flag;
2850	}	2856	}
2851		2857
2852	// read the next octet
2853	unicode_t
2854	rxvt_term::next_octet ()
2855	{
2856	return cmdbuf_ptr < cmdbuf_endp
2857	? *cmdbuf_ptr++
2858	: NOCHAR;
2859	}
2860
2861	// read the next character	2858	// read the next character
2862	unicode_t	2859	wchar_t
2863	rxvt_term::next_char ()	2860	rxvt_term::next_char ()
2864	{	2861	{
2865	while (cmdbuf_ptr < cmdbuf_endp)	2862	while (cmdbuf_ptr < cmdbuf_endp)
2866	{	2863	{
2867	// assume 7-bit to be ascii ALWAYS	2864	// assume 7-bit to be ascii ALWAYS
…		…
2877	cmdbuf_ptr = cmdbuf_endp;	2874	cmdbuf_ptr = cmdbuf_endp;
2878	break;	2875	break;
2879	}	2876	}
2880		2877
2881	if (len == (size_t)-1)	2878	if (len == (size_t)-1)
2882	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
2883		2880
2884	// assume wchar == unicode	2881	// assume wchar == unicode
2885	cmdbuf_ptr += len;	2882	cmdbuf_ptr += len;
2886	return wc & UNICODE_MASK;	2883	return wc & UNICODE_MASK;
2887	}	2884	}
2888		2885
2889	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;
2890	}	2896	}
2891		2897
2892	/* rxvt_cmd_getc () - Return next input character */	2898	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2899	/*
2894	* Return the next input character after first passing any keyboard input	2900	* Return the next input character after first passing any keyboard input
2895	* to the command.	2901	* to the command.
2896	*/	2902	*/
2897	unicode_t	2903	wchar_t
2898	rxvt_term::cmd_getc ()	2904	rxvt_term::cmd_getc ()
2899	{	2905	{
2900	unicode_t c = next_char ();	2906	wchar_t c = next_char ();
2901		2907
2902	if (c == NOCHAR)	2908	if (c == NOCHAR)
2903	throw out_of_input;	2909	throw out_of_input;
2904		2910
2905	return c;	2911	return c;
2906	}	2912	}
2907		2913
2908	unicode_t	2914	uint32_t
2909	rxvt_term::cmd_get8 ()	2915	rxvt_term::cmd_get8 ()
2910	{	2916	{
2911	unicode_t c = next_octet ();	2917	uint32_t c = next_octet ();
2912		2918
2913	if (c == NOCHAR)	2919	if (c == NOCHAR)
2914	throw out_of_input;	2920	throw out_of_input;
2915		2921
2916	return c;	2922	return c;
…		…
3183	break;	3189	break;
3184		3190
3185	/* 8.3.87: NEXT LINE */	3191	/* 8.3.87: NEXT LINE */
3186	case C1_NEL: /* ESC E */	3192	case C1_NEL: /* ESC E */
3187	{	3193	{
3188	unicode_t nlcr[] = { C0_LF, C0_CR };	3194	wchar_t nlcr[] = { C0_LF, C0_CR };
3189	scr_add_lines (nlcr, 1, 2);	3195	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190	}	3196	}
3191	break;	3197	break;
3192		3198
3193	/* kidnapped escape sequence: Should be 8.3.48 */	3199	/* kidnapped escape sequence: Should be 8.3.48 */
3194	case C1_ESA: /* ESC G */	3200	case C1_ESA: /* ESC G */
…		…
3858	{	3864	{
3859	if ((name = strchr (buf, ';')) == NULL)	3865	if ((name = strchr (buf, ';')) == NULL)
3860	break;	3866	break;
3861		3867
3862	*name++ = '\0';	3868	*name++ = '\0';
3863	color = atoi (buf);	3869	color = atoi (buf) + minCOLOR;
3864		3870
3865	if (color < 0 \|\| color >= TOTAL_COLORS)	3871	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866	break;	3872	break;
3867		3873
3868	if ((buf = strchr (name, ';')) != NULL)	3874	if ((buf = strchr (name, ';')) != NULL)
3869	*buf++ = '\0';	3875	*buf++ = '\0';
3870		3876
3871	if (name[0] == '?' && !name[1])	3877	if (name[0] == '?' && !name[1])
3872	{	3878	{
3873	unsigned short r, g, b;	3879	unsigned short r, g, b;
3874	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3880	pix_colors_focused[color].get (display, r, g, b);
3875	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);
3876	}	3882	}
3877	else	3883	else
3878	set_window_color (color + minCOLOR, name);	3884	set_window_color (color, name);
3879	}	3885	}
3880	break;	3886	break;
3881	case XTerm_Color00:	3887	case XTerm_Color00:
3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3888	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883	break;	3889	break;
3884	case XTerm_Color01:	3890	case XTerm_Color01:
3885	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3891	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886	break;	3892	break;
3887	#ifndef NO_CURSORCOLOR	3893	#ifndef NO_CURSORCOLOR
3888	case XTerm_Color_cursor:	3894	case XTerm_Color_cursor:
3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3895	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890	break;	3896	break;
…		…
3894	break;	3900	break;
3895	case XTerm_Color_pointer_bg:	3901	case XTerm_Color_pointer_bg:
3896	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);
3897	break;	3903	break;
3898	#ifndef NO_BOLD_UNDERLINE_REVERSE	3904	#ifndef NO_BOLD_UNDERLINE_REVERSE
3899	case XTerm_Color_BD:
3900	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901	break;
3902	case XTerm_Color_UL:
3903	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904	break;
3905	case XTerm_Color_RV:	3905	case XTerm_Color_RV:
3906	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);
3907	break;	3915	break;
3908	case URxvt_Color_IT:	3916	case URxvt_Color_IT:
3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3917	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910	break;	3918	break;
3911	#endif	3919	#endif
…		…
3916	if (am_transparent)	3924	if (am_transparent)
3917	want_full_refresh = want_refresh = 1;	3925	want_full_refresh = want_refresh = 1;
3918	break;	3926	break;
3919	#endif	3927	#endif
3920		3928
3921	case XTerm_Pixmap:	3929	case Rxvt_Pixmap:
3922	if (*str != ';')	3930	if (*str != ';')
3923	{	3931	{
3924	#if XPM_BACKGROUND	3932	#if XPM_BACKGROUND
3925	scale_pixmap (""); /* reset to default scaling */	3933	scale_pixmap (""); /* reset to default scaling */
3926	set_bgPixmap (str); /* change pixmap */	3934	set_bgPixmap (str); /* change pixmap */
3927	#endif
3928	scr_touch (true);	3935	scr_touch (true);
		3936	#endif
3929	}	3937	}
		3938
3930	while ((str = strchr (str, ';')) != NULL)	3939	while ((str = strchr (str, ';')) != NULL)
3931	{	3940	{
3932	str++;	3941	str++;
3933	#if XPM_BACKGROUND	3942	#if XPM_BACKGROUND
3934	changed += scale_pixmap (str);	3943	changed += scale_pixmap (str);
…		…
3937		3946
3938	if (changed)	3947	if (changed)
3939	{	3948	{
3940	#ifdef XPM_BACKGROUND	3949	#ifdef XPM_BACKGROUND
3941	resize_pixmap ();	3950	resize_pixmap ();
3942	#endif
3943	scr_touch (true);	3951	scr_touch (true);
		3952	#endif
3944	}	3953	}
3945	break;	3954	break;
3946		3955
3947	case XTerm_restoreFG:	3956	case Rxvt_restoreFG:
3948	set_window_color (Color_fg, str);	3957	set_window_color (Color_fg, str);
3949	break;	3958	break;
3950	case XTerm_restoreBG:	3959	case Rxvt_restoreBG:
3951	set_window_color (Color_bg, str);	3960	set_window_color (Color_bg, str);
3952	break;	3961	break;
3953		3962
3954	case XTerm_logfile:	3963	case XTerm_logfile:
3955	// TODO, when secure mode?	3964	// TODO, when secure mode?
…		…
3960	if (OPTION (Opt_insecure))	3969	if (OPTION (Opt_insecure))
3961	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3970	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962	break;	3971	break;
3963	#endif	3972	#endif
3964	#if 0	3973	#if 0
3965	case XTerm_dumpscreen: /* no error notices */	3974	case Rxvt_dumpscreen: /* no error notices */
3966	{	3975	{
3967	int fd;	3976	int fd;
3968	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)
3969	{	3978	{
3970	scr_dump (fd);	3979	scr_dump (fd);
…		…
4022	break;	4031	break;
4023	#endif	4032	#endif
4024		4033
4025	#if ENABLE_PERL	4034	#if ENABLE_PERL
4026	case URxvt_perl:	4035	case URxvt_perl:
4027	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4036	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028	; // no responses yet	4037	; // no responses yet
4029	break;	4038	break;
4030	#endif	4039	#endif
4031	}	4040	}
4032	}	4041	}
…		…
4144	/* extra handling for values with state unkept */	4153	/* extra handling for values with state unkept */
4145	switch (arg[i])	4154	switch (arg[i])
4146	{	4155	{
4147	#if ENABLE_STYLES	4156	#if ENABLE_STYLES
4148	case 1021:	4157	case 1021:
4149	if (mode)	4158	set_option (Opt_intensityStyles, mode);
4150	SET_OPTION (Opt_intensityStyles);
4151	else
4152	CLR_OPTION (Opt_intensityStyles);
4153		4159
4154	scr_touch (true);	4160	scr_touch (true);
4155	break;	4161	break;
4156	#endif	4162	#endif
4157	case 1048: /* alternative cursor save */	4163	case 1048: /* alternative cursor save */
…		…
4179	case 3: /* 80/132 */	4185	case 3: /* 80/132 */
4180	if (priv_modes & PrivMode_132OK)	4186	if (priv_modes & PrivMode_132OK)
4181	set_widthheight (((state ? 132 : 80) * fwidth), height);	4187	set_widthheight (((state ? 132 : 80) * fwidth), height);
4182	break;	4188	break;
4183	case 4: /* smooth scrolling */	4189	case 4: /* smooth scrolling */
4184	if (!state)	4190	set_option (Opt_jumpScroll, !state);
4185	SET_OPTION (Opt_jumpScroll);
4186	else
4187	CLR_OPTION (Opt_jumpScroll);
4188	break;	4191	break;
4189	case 5: /* reverse video */	4192	case 5: /* reverse video */
4190	scr_rvideo_mode (state);	4193	scr_rvideo_mode (state);
4191	break;	4194	break;
4192	case 6: /* relative/absolute origins */	4195	case 6: /* relative/absolute origins */
…		…
4233	#if 0	4236	#if 0
4234	case 1001:	4237	case 1001:
4235	break; /* X11 mouse highlighting */	4238	break; /* X11 mouse highlighting */
4236	#endif	4239	#endif
4237	case 1010: /* scroll to bottom on TTY output inhibit */	4240	case 1010: /* scroll to bottom on TTY output inhibit */
4238	if (!state)	4241	set_option (Opt_scrollTtyOutput, !state);
4239	SET_OPTION (Opt_scrollTtyOutput);
4240	else
4241	CLR_OPTION (Opt_scrollTtyOutput);
4242	break;	4242	break;
4243	case 1011: /* scroll to bottom on key press */	4243	case 1011: /* scroll to bottom on key press */
4244	if (state)	4244	set_option (Opt_scrollTtyKeypress, state);
4245	SET_OPTION (Opt_scrollTtyKeypress);
4246	else
4247	CLR_OPTION (Opt_scrollTtyKeypress);
4248	break;	4245	break;
4249	case 1047: /* secondary screen w/ clearing last */	4246	case 1047: /* secondary screen w/ clearing last */
4250	if (OPTION (Opt_secondaryScreen))	4247	if (OPTION (Opt_secondaryScreen))
4251	if (current_screen != PRIMARY)	4248	if (current_screen != PRIMARY)
4252	scr_erase_screen (2);	4249	scr_erase_screen (2);
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4459	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4460
4464	void	4461	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4462	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4463	{
		4464	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4465	return;
		4466
4467	if (pty.pty < 0)	4467	if (pty.pty < 0)
4468	return;	4468	return;
4469		4469
4470	if (v_buflen == 0)	4470	if (v_buflen == 0)
4471	{	4471	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.240 by root, Fri Jan 6 03:40:19 2006 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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC