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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 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_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)
…		…
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 > -nsaved && 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)
		993	row++;
		994	else
989	{	995	{
990	// line not filtered, mark it as filtered	996	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	997	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	998	while (l->is_longer ())
993	{	999	{
…		…
999	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	1005	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000		1006
1001	break;	1007	break;
1002	}	1008	}
1003	}	1009	}
1004	while (l->is_longer ());	1010	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	1011	}
1008		1012	while (++row < end_row);
1009	}	1013	}
1010		1014
1011	scr_refresh (refresh_type);	1015	scr_refresh (refresh_type);
1012	scrollbar_show (1);	1016	scrollbar_show (1);
1013	#ifdef USE_XIM	1017	#ifdef USE_XIM
…		…
1202		1206
1203	#ifdef POINTER_BLANK	1207	#ifdef POINTER_BLANK
1204	void	1208	void
1205	rxvt_term::pointer_blank ()	1209	rxvt_term::pointer_blank ()
1206	{	1210	{
1207	if (! OPTION (Opt_pointerBlank))	1211	if (!OPTION (Opt_pointerBlank))
1208	return;	1212	return;
1209		1213
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1214	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1215	XFlush (display->display);
1212		1216
…		…
1309	dDisp;	1313	dDisp;
1310		1314
1311	SET_R (this);	1315	SET_R (this);
1312	SET_LOCALE (locale);	1316	SET_LOCALE (locale);
1313		1317
1314	#if defined(CURSOR_BLINK)
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316	{
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340
1341	Window unused_root, unused_child;	1318	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1319	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1320	unsigned int unused_mask;
1344		1321
1345	switch (ev.type)	1322	switch (ev.type)
…		…
1352		1329
1353	break;	1330	break;
1354		1331
1355	case KeyRelease:	1332	case KeyRelease:
1356	{	1333	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1334	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1335	KeySym keysym;
1359		1336
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1337	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1338	#endif
1362		1339
1363	#if ENABLE_FRILLS \|\| ISO_14755	1340	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1341	// ISO 14755 support
1365	if (iso14755buf)	1342	if (iso14755buf)
…		…
1370	# endif	1347	# endif
1371	# if ISO_14755	1348	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1349	// iso14755 part 5.2 handling: release time
1373	// first: controls	1350	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1351	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1352	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1353	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1354	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1355	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1356	commit_iso14755 ();
1380	return; // case-break;	1357	goto skip_switch;
1381	}	1358	}
1382		1359
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1360	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1361	if (i[0] == keysym)
1385	{	1362	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1363	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1364	commit_iso14755 ();
1388	return; // case-break;	1365	goto skip_switch;
1389	}	1366	}
1390		1367
1391	scr_bell ();	1368	scr_bell ();
1392	# endif	1369	# endif
1393	iso14755buf = 0;	1370	iso14755buf = 0;
…		…
1412	else	1389	else
1413	iso14755buf = 0;	1390	iso14755buf = 0;
1414	}	1391	}
1415	#endif	1392	#endif
1416		1393
		1394	if (ev.xany.window == vt
		1395	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1396	break;
		1397
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1398	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1399	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1400	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1401	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1402	mouse_slip_wheel_speed = 0;
1422	#endif	1403	#endif
1423	break;	1404	break;
1424	}	1405	}
1425		1406
…		…
1555		1536
1556	case SelectionRequest:	1537	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1538	selection_send (ev.xselectionrequest);
1558	break;	1539	break;
1559		1540
		1541	case MapNotify:
		1542	mapped = 1;
		1543	#ifdef TEXT_BLINK
		1544	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1545	#endif
		1546	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1547	break;
		1548
1560	case UnmapNotify:	1549	case UnmapNotify:
1561	mapped = 0;	1550	mapped = 0;
1562	#ifdef TEXT_BLINK	1551	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1552	text_blink_ev.stop ();
1564	#endif	1553	#endif
1565	break;	1554	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;	1555	break;
1573		1556
1574	#ifdef TRANSPARENT	1557	#ifdef TRANSPARENT
1575	case ReparentNotify:	1558	case ReparentNotify:
1576	rootwin_cb (ev);	1559	rootwin_cb (ev);
…		…
1590		1573
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1574	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1575	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1576	ev.xexpose.width, ev.xexpose.height, False);
1594		1577
1595	scr_refresh (refresh_type);	1578	want_refresh = 1;
1596	}	1579	}
1597	else	1580	else
1598	{	1581	{
1599	XEvent unused_event;	1582	XEvent unused_event;
1600		1583
…		…
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1618	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1619	break;
1637		1620
1638	if (ev.xany.window == vt)	1621	if (ev.xany.window == vt)
1639	{	1622	{
		1623	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1624	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1625	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1626	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1627	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1628	;
1644		1629
1645	XQueryPointer (disp, vt,	1630	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1710	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1711	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1712	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1713	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1714	scrollbar_size ());
1730	scr_refresh (refresh_type);	1715	want_refresh = 1;
1731	refresh_limit = 0;	1716	refresh_limit = 0;
1732	scrollbar_show (1);	1717	scrollbar_show (1);
1733	}	1718	}
1734	break;	1719	break;
1735	}	1720	}
		1721
		1722	skip_switch: ;
		1723
		1724	#if defined(CURSOR_BLINK)
		1725	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1726	{
		1727	if (hidden_cursor)
		1728	{
		1729	hidden_cursor = 0;
		1730	want_refresh = 1;
		1731	}
		1732
		1733	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1734	}
		1735	#endif
		1736
		1737	#if defined(POINTER_BLANK)
		1738	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1739	{
		1740	if (ev.type == MotionNotify
		1741	\|\| ev.type == ButtonPress
		1742	\|\| ev.type == ButtonRelease)
		1743	if (hidden_pointer)
		1744	pointer_unblank ();
		1745
		1746	if (ev.type == KeyPress && hidden_pointer == 0)
		1747	pointer_blank ();
		1748	}
		1749	#endif
1736	}	1750	}
1737		1751
1738	void	1752	void
1739	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1740	{	1754	{
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1879	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1880	if (ev.button == MEvent.button && clickintime)
1867	{	1881	{
1868	/* same button, within alloted time */	1882	/* same button, within alloted time */
1869	MEvent.clicks++;	1883	MEvent.clicks++;
		1884
1870	if (MEvent.clicks > 1)	1885	if (MEvent.clicks > 1)
1871	{	1886	{
1872	/* only report double clicks */	1887	/* only report double clicks */
1873	MEvent.clicks = 2;	1888	MEvent.clicks = 2;
1874	mouse_report (ev);	1889	mouse_report (ev);
…		…
1894	else	1909	else
1895	{	1910	{
1896	if (ev.button != MEvent.button)	1911	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1912	MEvent.clicks = 0;
1898		1913
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))	1914	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1915	switch (ev.button)
1901	{	1916	{
1902	case Button1:	1917	case Button1:
1903	/* allow meta + click to select rectangular areas */	1918	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1919	/* should be done in screen.C */
…		…
2082	}	2097	}
2083		2098
2084	break;	2099	break;
2085	}	2100	}
2086	}	2101	}
		2102
2087	return;	2103	return;
2088	}	2104	}
		2105
2089	#if MENUBAR	2106	#if MENUBAR
2090	/*	2107	/*
2091	* Menubar window processing of button press	2108	* Menubar window processing of button press
2092	*/	2109	*/
2093	if (isMenuBarWindow (ev.window))	2110	if (isMenuBarWindow (ev.window))
…		…
2156	if (priv_modes & PrivMode_mouse_report	2173	if (priv_modes & PrivMode_mouse_report
2157	&& bypass_keystate	2174	&& bypass_keystate
2158	&& ev.button == Button1 && MEvent.clicks <= 1)	2175	&& ev.button == Button1 && MEvent.clicks <= 1)
2159	selection_extend (ev.x, ev.y, 0);	2176	selection_extend (ev.x, ev.y, 0);
2160		2177
		2178	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2179	return;
		2180
2161	switch (ev.button)	2181	switch (ev.button)
2162	{	2182	{
2163	case Button1:	2183	case Button1:
2164	case Button3:	2184	case Button3:
2165	selection_make (ev.time);	2185	selection_make (ev.time);
…		…
2196	slip_wheel_ev.start ();	2216	slip_wheel_ev.start ();
2197	}	2217	}
2198	else	2218	else
2199	{	2219	{
2200	# endif	2220	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2221	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2222	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	2223	# ifdef MOUSE_SLIP_WHEELING
2214	}	2224	}
2215	#endif	2225	# endif
2216	}	2226	}
2217	break;	2227	break;
2218	#endif	2228	#endif
2219	}	2229	}
2220	}	2230	}
…		…
2709		2719
2710	bool	2720	bool
2711	rxvt_term::cmd_parse ()	2721	rxvt_term::cmd_parse ()
2712	{	2722	{
2713	bool flag = false;	2723	bool flag = false;
2714	unicode_t ch = NOCHAR;	2724	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2725	char *seq_begin; // remember start of esc-sequence here
2716		2726
2717	for (;;)	2727	for (;;)
2718	{	2728	{
2719	if (ch == NOCHAR)	2729	if (ch == NOCHAR)
…		…
2740	if (seen_resize && cmd_pid)	2750	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2751	kill (-cmd_pid, SIGWINCH);
2742	}	2752	}
2743		2753
2744	/* Read a text string from the input buffer */	2754	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2755	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2756	bool refreshnow = false;
2747	int nlines = 0;	2757	int nlines = 0;
2748	unicode_t *str = buf;	2758	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2759	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2760
2751	for (;;)	2761	for (;;)
2752	{	2762	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2763	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2764	break;
…		…
2772	}	2782	}
2773		2783
2774	// scr_add_lines only works for nlines <= nrow - 1.	2784	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2785	if (nlines >= nrow - 1)
2776	{	2786	{
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2787	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2778	scr_add_lines (buf, nlines, str - buf);	2788	scr_add_lines (buf, str - buf, nlines);
2779		2789
2780	nlines = 0;	2790	nlines = 0;
2781	str = buf;	2791	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2792	eol = str + min (ncol, UBUFSIZ);
2783	}	2793	}
…		…
2797		2807
2798	seq_begin = cmdbuf_ptr;	2808	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2809	ch = next_char ();
2800	}	2810	}
2801		2811
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2812	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2803	scr_add_lines (buf, nlines, str - buf);	2813	scr_add_lines (buf, str - buf, nlines);
2804		2814
2805	/*	2815	/*
2806	* 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
2807	* 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.
2808	* the number of pages between refreshes is refresh_limit, which	2818	* the number of pages between refreshes is refresh_limit, which
…		…
2814	refresh_limit++;	2824	refresh_limit++;
2815	else	2825	else
2816	{	2826	{
2817	flag = true;	2827	flag = true;
2818	scr_refresh (refresh_type);	2828	scr_refresh (refresh_type);
2819	flush_ev.stop ();	2829	want_refresh = 1;
2820	}	2830	}
2821	}	2831	}
2822		2832
2823	}	2833	}
2824	else	2834	else
…		…
2839	}	2849	}
2840		2850
2841	return flag;	2851	return flag;
2842	}	2852	}
2843		2853
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	2854	// read the next character
2854	unicode_t	2855	wchar_t
2855	rxvt_term::next_char ()	2856	rxvt_term::next_char ()
2856	{	2857	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2858	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2859	{
2859	// assume 7-bit to be ascii ALWAYS	2860	// assume 7-bit to be ascii ALWAYS
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2870	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2871	break;
2871	}	2872	}
2872		2873
2873	if (len == (size_t)-1)	2874	if (len == (size_t)-1)
2874	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
2875		2876
2876	// assume wchar == unicode	2877	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2878	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2879	return wc & UNICODE_MASK;
2879	}	2880	}
2880		2881
2881	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;
2882	}	2892	}
2883		2893
2884	/* rxvt_cmd_getc () - Return next input character */	2894	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2895	/*
2886	* Return the next input character after first passing any keyboard input	2896	* Return the next input character after first passing any keyboard input
2887	* to the command.	2897	* to the command.
2888	*/	2898	*/
2889	unicode_t	2899	wchar_t
2890	rxvt_term::cmd_getc ()	2900	rxvt_term::cmd_getc ()
2891	{	2901	{
2892	unicode_t c = next_char ();	2902	wchar_t c = next_char ();
2893		2903
2894	if (c == NOCHAR)	2904	if (c == NOCHAR)
2895	throw out_of_input;	2905	throw out_of_input;
2896		2906
2897	return c;	2907	return c;
2898	}	2908	}
2899		2909
2900	unicode_t	2910	uint32_t
2901	rxvt_term::cmd_get8 ()	2911	rxvt_term::cmd_get8 ()
2902	{	2912	{
2903	unicode_t c = next_octet ();	2913	uint32_t c = next_octet ();
2904		2914
2905	if (c == NOCHAR)	2915	if (c == NOCHAR)
2906	throw out_of_input;	2916	throw out_of_input;
2907		2917
2908	return c;	2918	return c;
…		…
3175	break;	3185	break;
3176		3186
3177	/* 8.3.87: NEXT LINE */	3187	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3188	case C1_NEL: /* ESC E */
3179	{	3189	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3190	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3191	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3192	}
3183	break;	3193	break;
3184		3194
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3195	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3196	case C1_ESA: /* ESC G */
…		…
4014	break;	4024	break;
4015	#endif	4025	#endif
4016		4026
4017	#if ENABLE_PERL	4027	#if ENABLE_PERL
4018	case URxvt_perl:	4028	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4029	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	4030	; // no responses yet
4021	break;	4031	break;
4022	#endif	4032	#endif
4023	}	4033	}
4024	}	4034	}
…		…
4136	/* extra handling for values with state unkept */	4146	/* extra handling for values with state unkept */
4137	switch (arg[i])	4147	switch (arg[i])
4138	{	4148	{
4139	#if ENABLE_STYLES	4149	#if ENABLE_STYLES
4140	case 1021:	4150	case 1021:
4141	if (mode)	4151	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4152
4146	scr_touch (true);	4153	scr_touch (true);
4147	break;	4154	break;
4148	#endif	4155	#endif
4149	case 1048: /* alternative cursor save */	4156	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4178	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4179	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4180	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4181	break;
4175	case 4: /* smooth scrolling */	4182	case 4: /* smooth scrolling */
4176	if (!state)	4183	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4184	break;
4181	case 5: /* reverse video */	4185	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4186	scr_rvideo_mode (state);
4183	break;	4187	break;
4184	case 6: /* relative/absolute origins */	4188	case 6: /* relative/absolute origins */
…		…
4225	#if 0	4229	#if 0
4226	case 1001:	4230	case 1001:
4227	break; /* X11 mouse highlighting */	4231	break; /* X11 mouse highlighting */
4228	#endif	4232	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4233	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4234	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4235	break;
4235	case 1011: /* scroll to bottom on key press */	4236	case 1011: /* scroll to bottom on key press */
4236	if (state)	4237	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4238	break;
4241	case 1047: /* secondary screen w/ clearing last */	4239	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4240	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4241	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4242	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4452	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4453
4456	void	4454	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4455	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4456	{
		4457	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4458	return;
		4459
4459	if (pty.pty < 0)	4460	if (pty.pty < 0)
4460	return;	4461	return;
4461		4462
4462	if (v_buflen == 0)	4463	if (v_buflen == 0)
4463	{	4464	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs. Revision 1.254 by root, Wed Jan 11 02:13:56 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 2006 UTC