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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
…		…
254	delete [] alloc;	254	delete [] alloc;
255	# endif	255	# endif
256	}	256	}
257	#endif	257	#endif
258		258
259	void	259	void ecb_cold
260	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
261	{	261	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		263
264	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
…		…
282	}	282	}
283		283
284	iso14755buf = 0;	284	iso14755buf = 0;
285	}	285	}
286		286
287	static int	287	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	288	hex_keyval (XKeyEvent &ev)
289	{	289	{
290	// check whether this event corresponds to a hex digit	290	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	291	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	292	for (int index = 0; index < 8; index++)
…		…
301		301
302	return -1;	302	return -1;
303	}	303	}
304	#endif	304	#endif
305		305
306	static inline KeySym	306	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	307	translate_keypad (KeySym keysym, bool kp)
308	{	308	{
309	#ifdef XK_KP_Home	309	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	310	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	311	XK_KP_7, // XK_KP_Home
…		…
337	# endif	337	# endif
338	#endif	338	#endif
339	return keysym;	339	return keysym;
340	}	340	}
341		341
342	static inline int	342	static inline int ecb_cold
343	map_function_key (KeySym keysym)	343	map_function_key (KeySym keysym)
344	{	344	{
345	int param = 0;	345	int param = 0;
346		346
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	396	break;
397	}	397	}
398	return param;	398	return param;
399	}	399	}
400		400
401	void	401	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	402	rxvt_term::key_press (XKeyEvent &ev)
403	{	403	{
404	int ctrl, meta, shft, len;	404	int ctrl, meta, shft, len;
405	KeySym keysym;	405	KeySym keysym;
406	int valid_keysym;	406	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	421	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	422	meta = ev.state & ModMetaMask;
423		423
424	kbuf[0] = 0;	424	kbuf[0] = 0;
425		425
426	#ifdef USE_XIM	426	#if USE_XIM
427	if (Input_Context)	427	if (Input_Context)
428	{	428	{
429	Status status_return;	429	Status status_return;
430		430
431	#if 0	431	#if 0
…		…
776	}	776	}
777		777
778	if (newlen)	778	if (newlen)
779	len = strlen (kbuf);	779	len = strlen (kbuf);
780		780
		781	if (len > 0)
		782	{
781	/*	783	/*
		784	* pass Shift/Control indicators for function keys ending with `~'
		785	*
		786	* eg,
		787	* Prior = "ESC[5~"
		788	* Shift+Prior = "ESC[5$"
		789	* Ctrl+Prior = "ESC[5^"
		790	* Ctrl+Shift+Prior = "ESC[5@"
		791	*/
		792	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		793	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		794
		795	/*
782	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
783	*/	797	*/
784	#ifdef META8_OPTION	798	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	800	kbuf[len - 1] \|= 0x80;
787	#endif	801	#endif
		802	}
788		803
789	}	804	}
790	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
791	{	806	{
792	len = 1;	807	len = 1;
…		…
826	{	841	{
827	view_start = 0;	842	view_start = 0;
828	want_refresh = 1;	843	want_refresh = 1;
829	}	844	}
830		845
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */	846	/* escape prefix */
846	if (meta	847	if (meta
847	#ifdef META8_OPTION	848	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
849	#endif	850	#endif
…		…
854	}	855	}
855		856
856	tt_write (kbuf, (unsigned int)len);	857	tt_write (kbuf, (unsigned int)len);
857	}	858	}
858		859
859	void	860	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	861	rxvt_term::key_release (XKeyEvent &ev)
861	{	862	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	864	KeySym keysym;
864		865
…		…
986	while (row < end_row);	987	while (row < end_row);
987	}	988	}
988		989
989	scr_refresh ();	990	scr_refresh ();
990	scrollBar.show (1);	991	scrollBar.show (1);
991	#ifdef USE_XIM	992	#if USE_XIM
992	im_send_spot ();	993	im_send_spot ();
993	#endif	994	#endif
994	}	995	}
995		996
996	display->flush ();	997	display->flush ();
…		…
1014	refresh_count = 0;	1015	refresh_count = 0;
1015	flush ();	1016	flush ();
1016	}	1017	}
1017		1018
1018	#ifdef CURSOR_BLINK	1019	#ifdef CURSOR_BLINK
		1020	void
		1021	rxvt_term::cursor_blink_reset ()
		1022	{
		1023	if (hidden_cursor)
		1024	{
		1025	hidden_cursor = 0;
		1026	want_refresh = 1;
		1027	}
		1028
		1029	if (option (Opt_cursorBlink))
		1030	cursor_blink_ev.again ();
		1031	else
		1032	cursor_blink_ev.stop ();
		1033	}
		1034
1019	void	1035	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1037	{
1022	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1039	want_refresh = 1;
…		…
1203	pty_write ();	1219	pty_write ();
1204		1220
1205	refresh_check ();	1221	refresh_check ();
1206	}	1222	}
1207		1223
1208	void	1224	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1210	{	1226	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1228	recolour_cursor ();
1213		1229
…		…
1218	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1219	#endif	1235	#endif
1220	}	1236	}
1221		1237
1222	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1223	void	1239	void ecb_cold
1224	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1225	{	1241	{
1226	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1227	return;	1243	return;
1228		1244
…		…
1230	XFlush (dpy);	1246	XFlush (dpy);
1231		1247
1232	hidden_pointer = 1;	1248	hidden_pointer = 1;
1233	}	1249	}
1234		1250
1235	void	1251	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1253	{
1238	make_current ();	1254	make_current ();
1239		1255
1240	pointer_blank ();	1256	pointer_blank ();
…		…
1332	32 + x,	1348	32 + x,
1333	32 + y);	1349	32 + y);
1334	}	1350	}
1335		1351
1336	/{{{ process an X event /	1352	/{{{ process an X event /
1337	void	1353	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1339	{	1355	{
1340	make_current ();	1356	make_current ();
1341		1357
1342	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1461	if (ev.xconfigure.window == parent)
1446	{	1462	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1464	;
1449		1465
		1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1467
1450	#ifdef HAVE_BG_PIXMAP	1468	#ifdef HAVE_BG_PIXMAP
		1469	if (bg_window_position_sensitive ())
		1470	want_position_change = true;
		1471	#endif
		1472
1451	bool moved = false;	1473	bool moved = false;
1452	if (bg_window_position_sensitive ())	1474
		1475	if (want_position_change)
1453	{	1476	{
1454	int x, y;	1477	int x, y;
		1478
1455	if (ev.xconfigure.send_event)	1479	if (ev.xconfigure.send_event)
1456	{	1480	{
1457	x = ev.xconfigure.x;	1481	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1482	y = ev.xconfigure.y;
1459	}	1483	}
1460	else	1484	else
1461	get_window_origin (x, y);	1485	get_window_origin (x, y);
1462		1486
		1487	if (x != parent_x \|\| y != parent_y)
		1488	{
		1489	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1490	parent_x = x;
		1491	parent_y = y;
		1492	}
		1493
1463	if (bg_set_position (x, y)	1494	if (bg_set_position (x, y)
1464	\|\| !(bg_flags & BG_IS_VALID))	1495	\|\| !(bg_flags & BG_IS_VALID))
1465	moved = true;	1496	moved = true;
1466	}	1497	}
1467	#endif
1468		1498
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1500	{
1471	seen_resize = 1;	1501	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1502	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1633	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1634	}	1664	}
1635	else	1665	else
1636	{	1666	{
1637	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1638	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1639	}	1669	}
1640		1670
1641	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1642	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1643	+ 1;	1673	+ 1;
…		…
1675	}	1705	}
1676	break;	1706	break;
1677	}	1707	}
1678		1708
1679	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1680	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1681	{
1682	if (hidden_cursor)
1683	{
1684	hidden_cursor = 0;
1685	want_refresh = 1;
1686	}
1687
1688	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1689	}
1690	#endif	1712	#endif
1691		1713
1692	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694	{	1716	{
…		…
1705		1727
1706	refresh_check ();	1728	refresh_check ();
1707	}	1729	}
1708		1730
1709	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1710	void	1732	void ecb_cold
1711	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1712	{	1734	{
1713	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1714	return;	1736	return;
1715		1737
…		…
1721	XFree (h);	1743	XFree (h);
1722	}	1744	}
1723	}	1745	}
1724	#endif	1746	#endif
1725		1747
1726	void	1748	void ecb_cold
1727	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1728	{	1750	{
1729	if (!focus)	1751	if (!focus)
1730	{	1752	{
1731	focus = 1;	1753	focus = 1;
…		…
1756		1778
1757	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758	}	1780	}
1759	}	1781	}
1760		1782
1761	void	1783	void ecb_cold
1762	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1763	{	1785	{
1764	if (focus)	1786	if (focus)
1765	{	1787	{
1766	focus = 0;	1788	focus = 0;
…		…
1799		1821
1800	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801	}	1823	}
1802	}	1824	}
1803		1825
1804	void	1826	void ecb_cold
1805	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1806	{	1828	{
1807	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1808	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1809	{	1831	{
…		…
1813	}	1835	}
1814	#endif	1836	#endif
1815	}	1837	}
1816		1838
1817	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1818	void	1840	void ecb_hot
1819	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1820	{	1842	{
1821	make_current ();	1843	make_current ();
1822		1844
1823	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1846	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825	return;	1847	return;
1826		1848
1827	# if ENABLE_TRANSPARENCY
1828	switch (ev.type)	1849	switch (ev.type)
1829	{	1850	{
1830	case PropertyNotify:	1851	case PropertyNotify:
1831	/*	1852	/*
1832	* if user used some Esetroot compatible prog to set the root bg,	1853	* if user used some Esetroot compatible prog to set the root bg,
1833	* use the property to determine the pixmap. We use it later on.	1854	* use the property to determine the pixmap. We use it later on.
1834	*/	1855	*/
1835	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1856	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1857	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837	{	1858	{
		1859	# if ENABLE_TRANSPARENCY
1838	bg_set_root_pixmap ();	1860	bg_set_root_pixmap ();
1839	update_background ();	1861	update_background ();
		1862	#endif
		1863	#if ENABLE_PERL
		1864	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1865	#endif
1840	}	1866	}
1841		1867
1842	break;	1868	break;
1843	}	1869	}
1844	# endif
1845		1870
1846	refresh_check ();	1871	refresh_check ();
1847	}	1872	}
1848	#endif	1873	#endif
1849		1874
…		…
2162	case Button3:	2187	case Button3:
2163	selection_make (ev.time);	2188	selection_make (ev.time);
2164	break;	2189	break;
2165		2190
2166	case Button2:	2191	case Button2:
2167	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2192	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2168	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2193	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169	break;	2194	break;
2170		2195
2171	#ifdef MOUSE_WHEEL	2196	#ifdef MOUSE_WHEEL
2172	case Button4:	2197	case Button4:
…		…
2207	}	2232	}
2208	}	2233	}
2209		2234
2210	/}}} /	2235	/}}} /
2211		2236
2212	void	2237	void ecb_hot
2213	rxvt_term::cmd_parse ()	2238	rxvt_term::cmd_parse ()
2214	{	2239	{
2215	wchar_t ch = NOCHAR;	2240	wchar_t ch = NOCHAR;
2216	char *seq_begin; // remember start of esc-sequence here	2241	char *seq_begin; // remember start of esc-sequence here
2217		2242
…		…
2336	}	2361	}
2337	}	2362	}
2338	}	2363	}
2339		2364
2340	// read the next character	2365	// read the next character
2341	wchar_t	2366	wchar_t ecb_hot
2342	rxvt_term::next_char () NOTHROW	2367	rxvt_term::next_char () NOTHROW
2343	{	2368	{
2344	while (cmdbuf_ptr < cmdbuf_endp)	2369	while (cmdbuf_ptr < cmdbuf_endp)
2345	{	2370	{
2346	// assume 7-bit to be ascii ALWAYS	2371	// assume 7-bit to be ascii ALWAYS
…		…
2370		2395
2371	return NOCHAR;	2396	return NOCHAR;
2372	}	2397	}
2373		2398
2374	// read the next octet	2399	// read the next octet
2375	uint32_t	2400	uint32_t ecb_hot
2376	rxvt_term::next_octet () NOTHROW	2401	rxvt_term::next_octet () NOTHROW
2377	{	2402	{
2378	return cmdbuf_ptr < cmdbuf_endp	2403	return cmdbuf_ptr < cmdbuf_endp
2379	? (unsigned char)*cmdbuf_ptr++	2404	? (unsigned char)*cmdbuf_ptr++
2380	: NOCHAR;	2405	: NOCHAR;
2381	}	2406	}
2382		2407
2383	static class out_of_input out_of_input;	2408	static class out_of_input out_of_input;
2384		2409
2385	wchar_t	2410	wchar_t ecb_hot
2386	rxvt_term::cmd_getc () THROW ((class out_of_input))	2411	rxvt_term::cmd_getc () THROW ((class out_of_input))
2387	{	2412	{
2388	wchar_t c = next_char ();	2413	wchar_t c = next_char ();
2389		2414
2390	if (c == NOCHAR)	2415	if (c == NOCHAR)
2391	throw out_of_input;	2416	throw out_of_input;
2392		2417
2393	return c;	2418	return c;
2394	}	2419	}
2395		2420
2396	uint32_t	2421	uint32_t ecb_hot
2397	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2422	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2398	{	2423	{
2399	uint32_t c = next_octet ();	2424	uint32_t c = next_octet ();
2400		2425
2401	if (c == NOCHAR)	2426	if (c == NOCHAR)
…		…
2405	}	2430	}
2406		2431
2407	/{{{ print pipe /	2432	/{{{ print pipe /
2408	/----------------------------------------------------------------------/	2433	/----------------------------------------------------------------------/
2409	#ifdef PRINTPIPE	2434	#ifdef PRINTPIPE
2410	FILE *	2435	FILE * ecb_cold
2411	rxvt_term::popen_printer ()	2436	rxvt_term::popen_printer ()
2412	{	2437	{
2413	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2438	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2414		2439
2415	if (stream == NULL)	2440	if (stream == NULL)
2416	rxvt_warn ("can't open printer pipe, not printing.\n");	2441	rxvt_warn ("can't open printer pipe, not printing.\n");
2417		2442
2418	return stream;	2443	return stream;
2419	}	2444	}
2420		2445
2421	int	2446	int ecb_cold
2422	rxvt_term::pclose_printer (FILE *stream)	2447	rxvt_term::pclose_printer (FILE *stream)
2423	{	2448	{
2424	fflush (stream);	2449	fflush (stream);
2425	return pclose (stream);	2450	return pclose (stream);
2426	}	2451	}
2427		2452
2428	/*	2453	/*
2429	* simulate attached vt100 printer	2454	* simulate attached vt100 printer
2430	*/	2455	*/
2431	void	2456	void ecb_cold
2432	rxvt_term::process_print_pipe ()	2457	rxvt_term::process_print_pipe ()
2433	{	2458	{
2434	FILE *fd = popen_printer ();	2459	FILE *fd = popen_printer ();
2435		2460
2436	if (!fd)	2461	if (!fd)
…		…
2491	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2516	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2492	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2517	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2493	};	2518	};
2494		2519
2495	/{{{ process non-printing single characters /	2520	/{{{ process non-printing single characters /
2496	void	2521	void ecb_hot
2497	rxvt_term::process_nonprinting (unicode_t ch)	2522	rxvt_term::process_nonprinting (unicode_t ch)
2498	{	2523	{
2499	switch (ch)	2524	switch (ch)
2500	{	2525	{
2501	case C0_ESC:	2526	case C0_ESC:
…		…
2547	}	2572	}
2548	/}}} /	2573	/}}} /
2549		2574
2550		2575
2551	/{{{ process VT52 escape sequences /	2576	/{{{ process VT52 escape sequences /
2552	void	2577	void ecb_cold
2553	rxvt_term::process_escape_vt52 (unicode_t ch)	2578	rxvt_term::process_escape_vt52 (unicode_t ch)
2554	{	2579	{
2555	int row, col;	2580	int row, col;
2556		2581
2557	switch (ch)	2582	switch (ch)
…		…
2607	}	2632	}
2608	/}}} /	2633	/}}} /
2609		2634
2610		2635
2611	/{{{ process escape sequences /	2636	/{{{ process escape sequences /
2612	void	2637	void ecb_hot
2613	rxvt_term::process_escape_seq ()	2638	rxvt_term::process_escape_seq ()
2614	{	2639	{
2615	unicode_t ch = cmd_getc ();	2640	unicode_t ch = cmd_getc ();
2616		2641
2617	if (priv_modes & PrivMode_vt52)	2642	if (priv_modes & PrivMode_vt52)
…		…
2769	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2794	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2770	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2795	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2771	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2796	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2772	};	2797	};
2773		2798
2774	void	2799	void ecb_hot
2775	rxvt_term::process_csi_seq ()	2800	rxvt_term::process_csi_seq ()
2776	{	2801	{
2777	unicode_t ch, priv, i;	2802	unicode_t ch, priv, i;
2778	unsigned int nargs, p;	2803	unsigned int nargs, p;
2779	int n, ndef;	2804	int n, ndef;
…		…
2886	}	2911	}
2887	break;	2912	break;
2888	#endif	2913	#endif
2889		2914
2890	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2915	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2891	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2916	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2892	arg[0] = -arg[0];	2917	arg[0] = -arg[0];
2893	/* FALLTHROUGH */	2918	/* FALLTHROUGH */
2894	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2919	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2895	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2920	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2896	scr_gotorc (arg[0], 0, RELATIVE);	2921	scr_gotorc (arg[0], 0, RELATIVE);
2897	break;	2922	break;
2898		2923
2899	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2924	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2900	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2925	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3133	break;	3158	break;
3134		3159
3135	//case 9: NYI, TODO, restore maximized window or maximize window	3160	//case 9: NYI, TODO, restore maximized window or maximize window
3136	default:	3161	default:
3137	if (args[0] >= 24) /* set height (chars) */	3162	if (args[0] >= 24) /* set height (chars) */
3138	set_widthheight ((unsigned int)width,	3163	set_widthheight ((unsigned int)vt_width,
3139	(unsigned int) (args[1] * fheight));	3164	(unsigned int) (args[1] * fheight));
3140	break;	3165	break;
3141		3166
3142	/*	3167	/*
3143	* reports - some output format copied from XTerm	3168	* reports - some output format copied from XTerm
…		…
3429	process_color_seq (op, Color_tint, str, resp);	3454	process_color_seq (op, Color_tint, str, resp);
3430	{	3455	{
3431	bool changed = false;	3456	bool changed = false;
3432		3457
3433	if (ISSET_PIXCOLOR (Color_tint))	3458	if (ISSET_PIXCOLOR (Color_tint))
3434	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3459	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435		3460
3436	if (changed)	3461	if (changed)
3437	update_background ();	3462	update_background ();
3438	}	3463	}
3439		3464
…		…
3443	#if BG_IMAGE_FROM_FILE	3468	#if BG_IMAGE_FROM_FILE
3444	case Rxvt_Pixmap:	3469	case Rxvt_Pixmap:
3445	if (!strcmp (str, "?"))	3470	if (!strcmp (str, "?"))
3446	{	3471	{
3447	char str[256];	3472	char str[256];
		3473	int h_scale = 0, v_scale = 0;
		3474	int h_align = 0, v_align = 0;
		3475	if (image_vec.size () > 0)
		3476	{
		3477	h_scale = image_vec[0].h_scale;
		3478	v_scale = image_vec[0].v_scale;
		3479	h_align = image_vec[0].h_align;
		3480	v_align = image_vec[0].v_align;
		3481	}
3448		3482
3449	sprintf (str, "[%dx%d+%d+%d]",	3483	sprintf (str, "[%dx%d+%d+%d]",
3450	min (h_scale, 32767), min (v_scale, 32767),	3484	h_scale, v_scale,
3451	min (h_align, 32767), min (v_align, 32767));	3485	h_align, v_align);
3452	process_xterm_seq (XTerm_title, str, CHAR_ST);	3486	process_xterm_seq (XTerm_title, str, CHAR_ST);
3453	}	3487	}
3454	else	3488	else
3455	{	3489	{
3456	bool changed = false;	3490	bool changed = false;
3457		3491
3458	if (*str != ';')	3492	if (*str != ';')
3459	{	3493	{
3460	if (bg_set_file (str)) /* change pixmap */	3494	if (image_vec.size () > 0)
		3495	changed = image_vec[0].set_file_geometry (str);
		3496	else
		3497	{
		3498	rxvt_image *image = new_image ();
		3499	if (!image->set_file_geometry (str))
		3500	image_vec.pop_back ();
		3501	else
3461	changed = true;	3502	changed = true;
		3503	}
3462	}	3504	}
3463	else	3505	else
3464	{	3506	{
3465	str++;	3507	str++;
		3508	if (image_vec.size () > 0)
3466	if (bg_set_geometry (str, true))	3509	changed = image_vec[0].set_geometry (str, true);
3467	changed = true;
3468	}	3510	}
3469		3511
3470	if (changed)	3512	if (changed)
3471	{	3513	{
3472	if (bg_window_position_sensitive ())	3514	if (bg_window_position_sensitive ())
…		…
3571	* 's' = save	3613	* 's' = save
3572	* 'r' = restore	3614	* 'r' = restore
3573	* 't' = toggle	3615	* 't' = toggle
3574	* so no need for fancy checking	3616	* so no need for fancy checking
3575	*/	3617	*/
3576	int	3618	int ecb_cold
3577	rxvt_term::privcases (int mode, unsigned long bit)	3619	rxvt_term::privcases (int mode, unsigned long bit)
3578	{	3620	{
3579	int state;	3621	int state;
3580		3622
3581	if (mode == 's')	3623	if (mode == 's')
3582	{	3624	{
3583	SavedModes \|= (priv_modes & bit);	3625	if (priv_modes & bit)
		3626	SavedModes \|= bit;
		3627	else
		3628	SavedModes &= ~bit;
3584	return -1;	3629	return -1;
3585	}	3630	}
3586	else	3631	else
3587	{	3632	{
3588	if (mode == 'r')	3633	if (mode == 'r')
…		…
3798	}	3843	}
3799	}	3844	}
3800	/}}} /	3845	/}}} /
3801		3846
3802	/{{{ process sgr sequences /	3847	/{{{ process sgr sequences /
3803	void	3848	void ecb_hot
3804	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3849	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3805	{	3850	{
3806	unsigned int i;	3851	unsigned int i;
3807	short rendset;	3852	short rendset;
3808	int rendstyle;	3853	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs. Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC