[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.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_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)
		993	row++;
		994	else
992	{	995	{
993	// line not filtered, mark it as filtered	996	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	997	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	998	while (l->is_longer ())
996	{	999	{
…		…
1002	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));
1003		1006
1004	break;	1007	break;
1005	}	1008	}
1006	}	1009	}
1007	while (l->is_longer ());	1010	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1011	}
1011		1012	while (++row < end_row);
1012	}	1013	}
1013		1014
1014	scr_refresh (refresh_type);	1015	scr_refresh (refresh_type);
1015	scrollbar_show (1);	1016	scrollbar_show (1);
1016	#ifdef USE_XIM	1017	#ifdef USE_XIM
…		…
1205		1206
1206	#ifdef POINTER_BLANK	1207	#ifdef POINTER_BLANK
1207	void	1208	void
1208	rxvt_term::pointer_blank ()	1209	rxvt_term::pointer_blank ()
1209	{	1210	{
1210	if (! OPTION (Opt_pointerBlank))	1211	if (!OPTION (Opt_pointerBlank))
1211	return;	1212	return;
1212		1213
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1214	XDefineCursor (display->display, vt, display->blank_cursor);
1214	XFlush (display->display);	1215	XFlush (display->display);
1215		1216
…		…
1312	dDisp;	1313	dDisp;
1313		1314
1314	SET_R (this);	1315	SET_R (this);
1315	SET_LOCALE (locale);	1316	SET_LOCALE (locale);
1316		1317
1317	#if defined(CURSOR_BLINK)
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;	1318	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1319	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1320	unsigned int unused_mask;
1347		1321
1348	switch (ev.type)	1322	switch (ev.type)
…		…
1355		1329
1356	break;	1330	break;
1357		1331
1358	case KeyRelease:	1332	case KeyRelease:
1359	{	1333	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1334	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1335	KeySym keysym;
1362		1336
1363	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 :/
1364	#endif	1338	#endif
1365		1339
1366	#if ENABLE_FRILLS \|\| ISO_14755	1340	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1341	// ISO 14755 support
1368	if (iso14755buf)	1342	if (iso14755buf)
…		…
1373	# endif	1347	# endif
1374	# if ISO_14755	1348	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1349	// iso14755 part 5.2 handling: release time
1376	// first: controls	1350	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1351	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1352	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1353	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1354	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1355	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1356	commit_iso14755 ();
1383	return; // case-break;	1357	goto skip_switch;
1384	}	1358	}
1385		1359
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1360	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1361	if (i[0] == keysym)
1388	{	1362	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1363	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1364	commit_iso14755 ();
1391	return; // case-break;	1365	goto skip_switch;
1392	}	1366	}
1393		1367
1394	scr_bell ();	1368	scr_bell ();
1395	# endif	1369	# endif
1396	iso14755buf = 0;	1370	iso14755buf = 0;
…		…
1415	else	1389	else
1416	iso14755buf = 0;	1390	iso14755buf = 0;
1417	}	1391	}
1418	#endif	1392	#endif
1419		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
1420	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1398	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421	if (!(ev.xkey.state & ControlMask))	1399	if (!(ev.xkey.state & ControlMask))
1422	slip_wheel_ev.stop ();	1400	slip_wheel_ev.stop ();
1423	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1401	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1424	mouse_slip_wheel_speed = 0;	1402	mouse_slip_wheel_speed = 0;
1425	#endif	1403	#endif
1426	break;	1404	break;
1427	}	1405	}
1428		1406
…		…
1558		1536
1559	case SelectionRequest:	1537	case SelectionRequest:
1560	selection_send (ev.xselectionrequest);	1538	selection_send (ev.xselectionrequest);
1561	break;	1539	break;
1562		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
1563	case UnmapNotify:	1549	case UnmapNotify:
1564	mapped = 0;	1550	mapped = 0;
1565	#ifdef TEXT_BLINK	1551	#ifdef TEXT_BLINK
1566	text_blink_ev.stop ();	1552	text_blink_ev.stop ();
1567	#endif	1553	#endif
1568	break;	1554	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;	1555	break;
1576		1556
1577	#ifdef TRANSPARENT	1557	#ifdef TRANSPARENT
1578	case ReparentNotify:	1558	case ReparentNotify:
1579	rootwin_cb (ev);	1559	rootwin_cb (ev);
…		…
1593		1573
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1574	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1595	scr_expose (ev.xexpose.x, ev.xexpose.y,	1575	scr_expose (ev.xexpose.x, ev.xexpose.y,
1596	ev.xexpose.width, ev.xexpose.height, False);	1576	ev.xexpose.width, ev.xexpose.height, False);
1597		1577
1598	scr_refresh (refresh_type);	1578	want_refresh = 1;
1599	}	1579	}
1600	else	1580	else
1601	{	1581	{
1602	XEvent unused_event;	1582	XEvent unused_event;
1603		1583
…		…
1730	&unused_root_x, &unused_root_y,	1710	&unused_root_x, &unused_root_y,
1731	&ev.xbutton.x, &ev.xbutton.y,	1711	&ev.xbutton.x, &ev.xbutton.y,
1732	&unused_mask);	1712	&unused_mask);
1733	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1713	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734	scrollbar_size ());	1714	scrollbar_size ());
1735	scr_refresh (refresh_type);	1715	want_refresh = 1;
1736	refresh_limit = 0;	1716	refresh_limit = 0;
1737	scrollbar_show (1);	1717	scrollbar_show (1);
1738	}	1718	}
1739	break;	1719	break;
1740	}	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
1741	}	1750	}
1742		1751
1743	void	1752	void
1744	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1745	{	1754	{
…		…
1870	#ifdef MOUSE_REPORT_DOUBLECLICK	1879	#ifdef MOUSE_REPORT_DOUBLECLICK
1871	if (ev.button == MEvent.button && clickintime)	1880	if (ev.button == MEvent.button && clickintime)
1872	{	1881	{
1873	/* same button, within alloted time */	1882	/* same button, within alloted time */
1874	MEvent.clicks++;	1883	MEvent.clicks++;
		1884
1875	if (MEvent.clicks > 1)	1885	if (MEvent.clicks > 1)
1876	{	1886	{
1877	/* only report double clicks */	1887	/* only report double clicks */
1878	MEvent.clicks = 2;	1888	MEvent.clicks = 2;
1879	mouse_report (ev);	1889	mouse_report (ev);
…		…
2087	}	2097	}
2088		2098
2089	break;	2099	break;
2090	}	2100	}
2091	}	2101	}
		2102
2092	return;	2103	return;
2093	}	2104	}
		2105
2094	#if MENUBAR	2106	#if MENUBAR
2095	/*	2107	/*
2096	* Menubar window processing of button press	2108	* Menubar window processing of button press
2097	*/	2109	*/
2098	if (isMenuBarWindow (ev.window))	2110	if (isMenuBarWindow (ev.window))
…		…
2161	if (priv_modes & PrivMode_mouse_report	2173	if (priv_modes & PrivMode_mouse_report
2162	&& bypass_keystate	2174	&& bypass_keystate
2163	&& ev.button == Button1 && MEvent.clicks <= 1)	2175	&& ev.button == Button1 && MEvent.clicks <= 1)
2164	selection_extend (ev.x, ev.y, 0);	2176	selection_extend (ev.x, ev.y, 0);
2165		2177
2166	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2178	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167	return;	2179	return;
2168		2180
2169	switch (ev.button)	2181	switch (ev.button)
2170	{	2182	{
2171	case Button1:	2183	case Button1:
…		…
2204	slip_wheel_ev.start ();	2216	slip_wheel_ev.start ();
2205	}	2217	}
2206	else	2218	else
2207	{	2219	{
2208	# endif	2220	# endif
2209	# ifdef JUMP_MOUSE_WHEEL
2210	scr_page (v, i);	2221	scr_page (v, i);
2211	scr_refresh (SMOOTH_REFRESH);
2212	scrollbar_show (1);	2222	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	2223	# ifdef MOUSE_SLIP_WHEELING
2222	}	2224	}
2223	#endif	2225	# endif
2224	}	2226	}
2225	break;	2227	break;
2226	#endif	2228	#endif
2227	}	2229	}
2228	}	2230	}
…		…
2717		2719
2718	bool	2720	bool
2719	rxvt_term::cmd_parse ()	2721	rxvt_term::cmd_parse ()
2720	{	2722	{
2721	bool flag = false;	2723	bool flag = false;
2722	unicode_t ch = NOCHAR;	2724	wchar_t ch = NOCHAR;
2723	char *seq_begin; // remember start of esc-sequence here	2725	char *seq_begin; // remember start of esc-sequence here
2724		2726
2725	for (;;)	2727	for (;;)
2726	{	2728	{
2727	if (ch == NOCHAR)	2729	if (ch == NOCHAR)
…		…
2748	if (seen_resize && cmd_pid)	2750	if (seen_resize && cmd_pid)
2749	kill (-cmd_pid, SIGWINCH);	2751	kill (-cmd_pid, SIGWINCH);
2750	}	2752	}
2751		2753
2752	/* Read a text string from the input buffer */	2754	/* Read a text string from the input buffer */
2753	unicode_t buf[UBUFSIZ];	2755	wchar_t buf[UBUFSIZ];
2754	bool refreshnow = false;	2756	bool refreshnow = false;
2755	int nlines = 0;	2757	int nlines = 0;
2756	unicode_t *str = buf;	2758	wchar_t *str = buf;
2757	unicode_t *eol = str + min (ncol, UBUFSIZ);	2759	wchar_t *eol = str + min (ncol, UBUFSIZ);
2758		2760
2759	for (;;)	2761	for (;;)
2760	{	2762	{
2761	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))
2762	break;	2764	break;
…		…
2780	}	2782	}
2781		2783
2782	// scr_add_lines only works for nlines <= nrow - 1.	2784	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2785	if (nlines >= nrow - 1)
2784	{	2786	{
2785	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)))
2786	scr_add_lines (buf, nlines, str - buf);	2788	scr_add_lines (buf, str - buf, nlines);
2787		2789
2788	nlines = 0;	2790	nlines = 0;
2789	str = buf;	2791	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2792	eol = str + min (ncol, UBUFSIZ);
2791	}	2793	}
…		…
2805		2807
2806	seq_begin = cmdbuf_ptr;	2808	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2809	ch = next_char ();
2808	}	2810	}
2809		2811
2810	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)))
2811	scr_add_lines (buf, nlines, str - buf);	2813	scr_add_lines (buf, str - buf, nlines);
2812		2814
2813	/*	2815	/*
2814	* 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
2815	* 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.
2816	* the number of pages between refreshes is refresh_limit, which	2818	* the number of pages between refreshes is refresh_limit, which
…		…
2822	refresh_limit++;	2824	refresh_limit++;
2823	else	2825	else
2824	{	2826	{
2825	flag = true;	2827	flag = true;
2826	scr_refresh (refresh_type);	2828	scr_refresh (refresh_type);
2827	flush_ev.stop ();	2829	want_refresh = 1;
2828	}	2830	}
2829	}	2831	}
2830		2832
2831	}	2833	}
2832	else	2834	else
…		…
2847	}	2849	}
2848		2850
2849	return flag;	2851	return flag;
2850	}	2852	}
2851		2853
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	2854	// read the next character
2862	unicode_t	2855	wchar_t
2863	rxvt_term::next_char ()	2856	rxvt_term::next_char ()
2864	{	2857	{
2865	while (cmdbuf_ptr < cmdbuf_endp)	2858	while (cmdbuf_ptr < cmdbuf_endp)
2866	{	2859	{
2867	// assume 7-bit to be ascii ALWAYS	2860	// assume 7-bit to be ascii ALWAYS
…		…
2877	cmdbuf_ptr = cmdbuf_endp;	2870	cmdbuf_ptr = cmdbuf_endp;
2878	break;	2871	break;
2879	}	2872	}
2880		2873
2881	if (len == (size_t)-1)	2874	if (len == (size_t)-1)
2882	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
2883		2876
2884	// assume wchar == unicode	2877	// assume wchar == unicode
2885	cmdbuf_ptr += len;	2878	cmdbuf_ptr += len;
2886	return wc & UNICODE_MASK;	2879	return wc & UNICODE_MASK;
2887	}	2880	}
2888		2881
2889	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;
2890	}	2892	}
2891		2893
2892	/* rxvt_cmd_getc () - Return next input character */	2894	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2895	/*
2894	* Return the next input character after first passing any keyboard input	2896	* Return the next input character after first passing any keyboard input
2895	* to the command.	2897	* to the command.
2896	*/	2898	*/
2897	unicode_t	2899	wchar_t
2898	rxvt_term::cmd_getc ()	2900	rxvt_term::cmd_getc ()
2899	{	2901	{
2900	unicode_t c = next_char ();	2902	wchar_t c = next_char ();
2901		2903
2902	if (c == NOCHAR)	2904	if (c == NOCHAR)
2903	throw out_of_input;	2905	throw out_of_input;
2904		2906
2905	return c;	2907	return c;
2906	}	2908	}
2907		2909
2908	unicode_t	2910	uint32_t
2909	rxvt_term::cmd_get8 ()	2911	rxvt_term::cmd_get8 ()
2910	{	2912	{
2911	unicode_t c = next_octet ();	2913	uint32_t c = next_octet ();
2912		2914
2913	if (c == NOCHAR)	2915	if (c == NOCHAR)
2914	throw out_of_input;	2916	throw out_of_input;
2915		2917
2916	return c;	2918	return c;
…		…
3183	break;	3185	break;
3184		3186
3185	/* 8.3.87: NEXT LINE */	3187	/* 8.3.87: NEXT LINE */
3186	case C1_NEL: /* ESC E */	3188	case C1_NEL: /* ESC E */
3187	{	3189	{
3188	unicode_t nlcr[] = { C0_LF, C0_CR };	3190	wchar_t nlcr[] = { C0_LF, C0_CR };
3189	scr_add_lines (nlcr, 1, 2);	3191	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190	}	3192	}
3191	break;	3193	break;
3192		3194
3193	/* kidnapped escape sequence: Should be 8.3.48 */	3195	/* kidnapped escape sequence: Should be 8.3.48 */
3194	case C1_ESA: /* ESC G */	3196	case C1_ESA: /* ESC G */
…		…
4022	break;	4024	break;
4023	#endif	4025	#endif
4024		4026
4025	#if ENABLE_PERL	4027	#if ENABLE_PERL
4026	case URxvt_perl:	4028	case URxvt_perl:
4027	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)))
4028	; // no responses yet	4030	; // no responses yet
4029	break;	4031	break;
4030	#endif	4032	#endif
4031	}	4033	}
4032	}	4034	}
…		…
4144	/* extra handling for values with state unkept */	4146	/* extra handling for values with state unkept */
4145	switch (arg[i])	4147	switch (arg[i])
4146	{	4148	{
4147	#if ENABLE_STYLES	4149	#if ENABLE_STYLES
4148	case 1021:	4150	case 1021:
4149	if (mode)	4151	set_option (Opt_intensityStyles, mode);
4150	SET_OPTION (Opt_intensityStyles);
4151	else
4152	CLR_OPTION (Opt_intensityStyles);
4153		4152
4154	scr_touch (true);	4153	scr_touch (true);
4155	break;	4154	break;
4156	#endif	4155	#endif
4157	case 1048: /* alternative cursor save */	4156	case 1048: /* alternative cursor save */
…		…
4179	case 3: /* 80/132 */	4178	case 3: /* 80/132 */
4180	if (priv_modes & PrivMode_132OK)	4179	if (priv_modes & PrivMode_132OK)
4181	set_widthheight (((state ? 132 : 80) * fwidth), height);	4180	set_widthheight (((state ? 132 : 80) * fwidth), height);
4182	break;	4181	break;
4183	case 4: /* smooth scrolling */	4182	case 4: /* smooth scrolling */
4184	if (!state)	4183	set_option (Opt_jumpScroll, !state);
4185	SET_OPTION (Opt_jumpScroll);
4186	else
4187	CLR_OPTION (Opt_jumpScroll);
4188	break;	4184	break;
4189	case 5: /* reverse video */	4185	case 5: /* reverse video */
4190	scr_rvideo_mode (state);	4186	scr_rvideo_mode (state);
4191	break;	4187	break;
4192	case 6: /* relative/absolute origins */	4188	case 6: /* relative/absolute origins */
…		…
4233	#if 0	4229	#if 0
4234	case 1001:	4230	case 1001:
4235	break; /* X11 mouse highlighting */	4231	break; /* X11 mouse highlighting */
4236	#endif	4232	#endif
4237	case 1010: /* scroll to bottom on TTY output inhibit */	4233	case 1010: /* scroll to bottom on TTY output inhibit */
4238	if (!state)	4234	set_option (Opt_scrollTtyOutput, !state);
4239	SET_OPTION (Opt_scrollTtyOutput);
4240	else
4241	CLR_OPTION (Opt_scrollTtyOutput);
4242	break;	4235	break;
4243	case 1011: /* scroll to bottom on key press */	4236	case 1011: /* scroll to bottom on key press */
4244	if (state)	4237	set_option (Opt_scrollTtyKeypress, state);
4245	SET_OPTION (Opt_scrollTtyKeypress);
4246	else
4247	CLR_OPTION (Opt_scrollTtyKeypress);
4248	break;	4238	break;
4249	case 1047: /* secondary screen w/ clearing last */	4239	case 1047: /* secondary screen w/ clearing last */
4250	if (OPTION (Opt_secondaryScreen))	4240	if (OPTION (Opt_secondaryScreen))
4251	if (current_screen != PRIMARY)	4241	if (current_screen != PRIMARY)
4252	scr_erase_screen (2);	4242	scr_erase_screen (2);
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4452	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4453
4464	void	4454	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4455	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4456	{
		4457	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4458	return;
		4459
4467	if (pty.pty < 0)	4460	if (pty.pty < 0)
4468	return;	4461	return;
4469		4462
4470	if (v_buflen == 0)	4463	if (v_buflen == 0)
4471	{	4464	{

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.254 by root, Wed Jan 11 02:13:56 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.254 by root, Wed Jan 11 02:13:56 2006 UTC