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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 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
…		…
855	}	855	}
856		856
857	tt_write (kbuf, (unsigned int)len);	857	tt_write (kbuf, (unsigned int)len);
858	}	858	}
859		859
860	void	860	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	861	rxvt_term::key_release (XKeyEvent &ev)
862	{	862	{
863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
864	KeySym keysym;	864	KeySym keysym;
865		865
…		…
987	while (row < end_row);	987	while (row < end_row);
988	}	988	}
989		989
990	scr_refresh ();	990	scr_refresh ();
991	scrollBar.show (1);	991	scrollBar.show (1);
992	#ifdef USE_XIM	992	#if USE_XIM
993	im_send_spot ();	993	im_send_spot ();
994	#endif	994	#endif
995	}	995	}
996		996
997	display->flush ();	997	display->flush ();
…		…
1015	refresh_count = 0;	1015	refresh_count = 0;
1016	flush ();	1016	flush ();
1017	}	1017	}
1018		1018
1019	#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
1020	void	1035	void
1021	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1022	{	1037	{
1023	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1024	want_refresh = 1;	1039	want_refresh = 1;
…		…
1204	pty_write ();	1219	pty_write ();
1205		1220
1206	refresh_check ();	1221	refresh_check ();
1207	}	1222	}
1208		1223
1209	void	1224	void ecb_cold
1210	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1211	{	1226	{
1212	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1213	recolour_cursor ();	1228	recolour_cursor ();
1214		1229
…		…
1219	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1220	#endif	1235	#endif
1221	}	1236	}
1222		1237
1223	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1224	void	1239	void ecb_cold
1225	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1226	{	1241	{
1227	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1228	return;	1243	return;
1229		1244
…		…
1231	XFlush (dpy);	1246	XFlush (dpy);
1232		1247
1233	hidden_pointer = 1;	1248	hidden_pointer = 1;
1234	}	1249	}
1235		1250
1236	void	1251	void ecb_cold
1237	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1238	{	1253	{
1239	make_current ();	1254	make_current ();
1240		1255
1241	pointer_blank ();	1256	pointer_blank ();
…		…
1333	32 + x,	1348	32 + x,
1334	32 + y);	1349	32 + y);
1335	}	1350	}
1336		1351
1337	/{{{ process an X event /	1352	/{{{ process an X event /
1338	void	1353	void ecb_hot
1339	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1340	{	1355	{
1341	make_current ();	1356	make_current ();
1342		1357
1343	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1446	if (ev.xconfigure.window == parent)	1461	if (ev.xconfigure.window == parent)
1447	{	1462	{
1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1464	;
1450		1465
		1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1467
1451	#ifdef HAVE_BG_PIXMAP	1468	#ifdef HAVE_BG_PIXMAP
		1469	if (bg_window_position_sensitive ())
		1470	want_position_change = true;
		1471	#endif
		1472
1452	bool moved = false;	1473	bool moved = false;
1453	if (bg_window_position_sensitive ())	1474
		1475	if (want_position_change)
1454	{	1476	{
1455	int x, y;	1477	int x, y;
		1478
1456	if (ev.xconfigure.send_event)	1479	if (ev.xconfigure.send_event)
1457	{	1480	{
1458	x = ev.xconfigure.x;	1481	x = ev.xconfigure.x;
1459	y = ev.xconfigure.y;	1482	y = ev.xconfigure.y;
1460	}	1483	}
1461	else	1484	else
1462	get_window_origin (x, y);	1485	get_window_origin (x, y);
1463		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
1464	if (bg_set_position (x, y)	1494	if (bg_set_position (x, y)
1465	\|\| !(bg_flags & BG_IS_VALID))	1495	\|\| !(bg_flags & BG_IS_VALID))
1466	moved = true;	1496	moved = true;
1467	}	1497	}
1468	#endif
1469		1498
1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1471	{	1500	{
1472	seen_resize = 1;	1501	seen_resize = 1;
1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1502	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1634	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1635	}	1664	}
1636	else	1665	else
1637	{	1666	{
1638	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1639	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1640	}	1669	}
1641		1670
1642	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1643	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1644	+ 1;	1673	+ 1;
…		…
1676	}	1705	}
1677	break;	1706	break;
1678	}	1707	}
1679		1708
1680	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1681	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1682	{
1683	if (hidden_cursor)
1684	{
1685	hidden_cursor = 0;
1686	want_refresh = 1;
1687	}
1688
1689	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1690	}
1691	#endif	1712	#endif
1692		1713
1693	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1694	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695	{	1716	{
…		…
1706		1727
1707	refresh_check ();	1728	refresh_check ();
1708	}	1729	}
1709		1730
1710	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1711	void	1732	void ecb_cold
1712	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1713	{	1734	{
1714	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1715	return;	1736	return;
1716		1737
…		…
1722	XFree (h);	1743	XFree (h);
1723	}	1744	}
1724	}	1745	}
1725	#endif	1746	#endif
1726		1747
1727	void	1748	void ecb_cold
1728	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1729	{	1750	{
1730	if (!focus)	1751	if (!focus)
1731	{	1752	{
1732	focus = 1;	1753	focus = 1;
…		…
1757		1778
1758	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759	}	1780	}
1760	}	1781	}
1761		1782
1762	void	1783	void ecb_cold
1763	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1764	{	1785	{
1765	if (focus)	1786	if (focus)
1766	{	1787	{
1767	focus = 0;	1788	focus = 0;
…		…
1800		1821
1801	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1802	}	1823	}
1803	}	1824	}
1804		1825
1805	void	1826	void ecb_cold
1806	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1807	{	1828	{
1808	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1809	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1810	{	1831	{
…		…
1814	}	1835	}
1815	#endif	1836	#endif
1816	}	1837	}
1817		1838
1818	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1819	void	1840	void ecb_hot
1820	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1821	{	1842	{
1822	make_current ();	1843	make_current ();
1823		1844
1824	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
2163	case Button3:	2184	case Button3:
2164	selection_make (ev.time);	2185	selection_make (ev.time);
2165	break;	2186	break;
2166		2187
2167	case Button2:	2188	case Button2:
2168	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2189	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2190	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170	break;	2191	break;
2171		2192
2172	#ifdef MOUSE_WHEEL	2193	#ifdef MOUSE_WHEEL
2173	case Button4:	2194	case Button4:
…		…
2208	}	2229	}
2209	}	2230	}
2210		2231
2211	/}}} /	2232	/}}} /
2212		2233
2213	void	2234	void ecb_hot
2214	rxvt_term::cmd_parse ()	2235	rxvt_term::cmd_parse ()
2215	{	2236	{
2216	wchar_t ch = NOCHAR;	2237	wchar_t ch = NOCHAR;
2217	char *seq_begin; // remember start of esc-sequence here	2238	char *seq_begin; // remember start of esc-sequence here
2218		2239
…		…
2337	}	2358	}
2338	}	2359	}
2339	}	2360	}
2340		2361
2341	// read the next character	2362	// read the next character
2342	wchar_t	2363	wchar_t ecb_hot
2343	rxvt_term::next_char () NOTHROW	2364	rxvt_term::next_char () NOTHROW
2344	{	2365	{
2345	while (cmdbuf_ptr < cmdbuf_endp)	2366	while (cmdbuf_ptr < cmdbuf_endp)
2346	{	2367	{
2347	// assume 7-bit to be ascii ALWAYS	2368	// assume 7-bit to be ascii ALWAYS
…		…
2371		2392
2372	return NOCHAR;	2393	return NOCHAR;
2373	}	2394	}
2374		2395
2375	// read the next octet	2396	// read the next octet
2376	uint32_t	2397	uint32_t ecb_hot
2377	rxvt_term::next_octet () NOTHROW	2398	rxvt_term::next_octet () NOTHROW
2378	{	2399	{
2379	return cmdbuf_ptr < cmdbuf_endp	2400	return cmdbuf_ptr < cmdbuf_endp
2380	? (unsigned char)*cmdbuf_ptr++	2401	? (unsigned char)*cmdbuf_ptr++
2381	: NOCHAR;	2402	: NOCHAR;
2382	}	2403	}
2383		2404
2384	static class out_of_input out_of_input;	2405	static class out_of_input out_of_input;
2385		2406
2386	wchar_t	2407	wchar_t ecb_hot
2387	rxvt_term::cmd_getc () THROW ((class out_of_input))	2408	rxvt_term::cmd_getc () THROW ((class out_of_input))
2388	{	2409	{
2389	wchar_t c = next_char ();	2410	wchar_t c = next_char ();
2390		2411
2391	if (c == NOCHAR)	2412	if (c == NOCHAR)
2392	throw out_of_input;	2413	throw out_of_input;
2393		2414
2394	return c;	2415	return c;
2395	}	2416	}
2396		2417
2397	uint32_t	2418	uint32_t ecb_hot
2398	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2419	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2399	{	2420	{
2400	uint32_t c = next_octet ();	2421	uint32_t c = next_octet ();
2401		2422
2402	if (c == NOCHAR)	2423	if (c == NOCHAR)
…		…
2406	}	2427	}
2407		2428
2408	/{{{ print pipe /	2429	/{{{ print pipe /
2409	/----------------------------------------------------------------------/	2430	/----------------------------------------------------------------------/
2410	#ifdef PRINTPIPE	2431	#ifdef PRINTPIPE
2411	FILE *	2432	FILE * ecb_cold
2412	rxvt_term::popen_printer ()	2433	rxvt_term::popen_printer ()
2413	{	2434	{
2414	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2435	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2415		2436
2416	if (stream == NULL)	2437	if (stream == NULL)
2417	rxvt_warn ("can't open printer pipe, not printing.\n");	2438	rxvt_warn ("can't open printer pipe, not printing.\n");
2418		2439
2419	return stream;	2440	return stream;
2420	}	2441	}
2421		2442
2422	int	2443	int ecb_cold
2423	rxvt_term::pclose_printer (FILE *stream)	2444	rxvt_term::pclose_printer (FILE *stream)
2424	{	2445	{
2425	fflush (stream);	2446	fflush (stream);
2426	return pclose (stream);	2447	return pclose (stream);
2427	}	2448	}
2428		2449
2429	/*	2450	/*
2430	* simulate attached vt100 printer	2451	* simulate attached vt100 printer
2431	*/	2452	*/
2432	void	2453	void ecb_cold
2433	rxvt_term::process_print_pipe ()	2454	rxvt_term::process_print_pipe ()
2434	{	2455	{
2435	FILE *fd = popen_printer ();	2456	FILE *fd = popen_printer ();
2436		2457
2437	if (!fd)	2458	if (!fd)
…		…
2492	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2513	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2493	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2514	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2494	};	2515	};
2495		2516
2496	/{{{ process non-printing single characters /	2517	/{{{ process non-printing single characters /
2497	void	2518	void ecb_hot
2498	rxvt_term::process_nonprinting (unicode_t ch)	2519	rxvt_term::process_nonprinting (unicode_t ch)
2499	{	2520	{
2500	switch (ch)	2521	switch (ch)
2501	{	2522	{
2502	case C0_ESC:	2523	case C0_ESC:
…		…
2548	}	2569	}
2549	/}}} /	2570	/}}} /
2550		2571
2551		2572
2552	/{{{ process VT52 escape sequences /	2573	/{{{ process VT52 escape sequences /
2553	void	2574	void ecb_cold
2554	rxvt_term::process_escape_vt52 (unicode_t ch)	2575	rxvt_term::process_escape_vt52 (unicode_t ch)
2555	{	2576	{
2556	int row, col;	2577	int row, col;
2557		2578
2558	switch (ch)	2579	switch (ch)
…		…
2608	}	2629	}
2609	/}}} /	2630	/}}} /
2610		2631
2611		2632
2612	/{{{ process escape sequences /	2633	/{{{ process escape sequences /
2613	void	2634	void ecb_hot
2614	rxvt_term::process_escape_seq ()	2635	rxvt_term::process_escape_seq ()
2615	{	2636	{
2616	unicode_t ch = cmd_getc ();	2637	unicode_t ch = cmd_getc ();
2617		2638
2618	if (priv_modes & PrivMode_vt52)	2639	if (priv_modes & PrivMode_vt52)
…		…
2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2791	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2792	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2793	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2773	};	2794	};
2774		2795
2775	void	2796	void ecb_hot
2776	rxvt_term::process_csi_seq ()	2797	rxvt_term::process_csi_seq ()
2777	{	2798	{
2778	unicode_t ch, priv, i;	2799	unicode_t ch, priv, i;
2779	unsigned int nargs, p;	2800	unsigned int nargs, p;
2780	int n, ndef;	2801	int n, ndef;
…		…
3134	break;	3155	break;
3135		3156
3136	//case 9: NYI, TODO, restore maximized window or maximize window	3157	//case 9: NYI, TODO, restore maximized window or maximize window
3137	default:	3158	default:
3138	if (args[0] >= 24) /* set height (chars) */	3159	if (args[0] >= 24) /* set height (chars) */
3139	set_widthheight ((unsigned int)width,	3160	set_widthheight ((unsigned int)vt_width,
3140	(unsigned int) (args[1] * fheight));	3161	(unsigned int) (args[1] * fheight));
3141	break;	3162	break;
3142		3163
3143	/*	3164	/*
3144	* reports - some output format copied from XTerm	3165	* reports - some output format copied from XTerm
…		…
3430	process_color_seq (op, Color_tint, str, resp);	3451	process_color_seq (op, Color_tint, str, resp);
3431	{	3452	{
3432	bool changed = false;	3453	bool changed = false;
3433		3454
3434	if (ISSET_PIXCOLOR (Color_tint))	3455	if (ISSET_PIXCOLOR (Color_tint))
3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3456	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436		3457
3437	if (changed)	3458	if (changed)
3438	update_background ();	3459	update_background ();
3439	}	3460	}
3440		3461
…		…
3444	#if BG_IMAGE_FROM_FILE	3465	#if BG_IMAGE_FROM_FILE
3445	case Rxvt_Pixmap:	3466	case Rxvt_Pixmap:
3446	if (!strcmp (str, "?"))	3467	if (!strcmp (str, "?"))
3447	{	3468	{
3448	char str[256];	3469	char str[256];
		3470	int h_scale = 0, v_scale = 0;
		3471	int h_align = 0, v_align = 0;
		3472	if (image_vec.size () > 0)
		3473	{
		3474	h_scale = image_vec[0].h_scale;
		3475	v_scale = image_vec[0].v_scale;
		3476	h_align = image_vec[0].h_align;
		3477	v_align = image_vec[0].v_align;
		3478	}
3449		3479
3450	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3451	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3452	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3453	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3454	}	3484	}
3455	else	3485	else
3456	{	3486	{
3457	bool changed = false;	3487	bool changed = false;
3458		3488
3459	if (*str != ';')	3489	if (*str != ';')
3460	{	3490	{
3461	if (bg_set_file (str)) /* change pixmap */	3491	if (image_vec.size () > 0)
		3492	changed = image_vec[0].set_file_geometry (str);
		3493	else
		3494	{
		3495	rxvt_image *image = new_image ();
		3496	if (!image->set_file_geometry (str))
		3497	image_vec.pop_back ();
		3498	else
3462	changed = true;	3499	changed = true;
		3500	}
3463	}	3501	}
3464	else	3502	else
3465	{	3503	{
3466	str++;	3504	str++;
		3505	if (image_vec.size () > 0)
3467	if (bg_set_geometry (str, true))	3506	changed = image_vec[0].set_geometry (str, true);
3468	changed = true;
3469	}	3507	}
3470		3508
3471	if (changed)	3509	if (changed)
3472	{	3510	{
3473	if (bg_window_position_sensitive ())	3511	if (bg_window_position_sensitive ())
…		…
3572	* 's' = save	3610	* 's' = save
3573	* 'r' = restore	3611	* 'r' = restore
3574	* 't' = toggle	3612	* 't' = toggle
3575	* so no need for fancy checking	3613	* so no need for fancy checking
3576	*/	3614	*/
3577	int	3615	int ecb_cold
3578	rxvt_term::privcases (int mode, unsigned long bit)	3616	rxvt_term::privcases (int mode, unsigned long bit)
3579	{	3617	{
3580	int state;	3618	int state;
3581		3619
3582	if (mode == 's')	3620	if (mode == 's')
3583	{	3621	{
3584	SavedModes \|= (priv_modes & bit);	3622	if (priv_modes & bit)
		3623	SavedModes \|= bit;
		3624	else
		3625	SavedModes &= ~bit;
3585	return -1;	3626	return -1;
3586	}	3627	}
3587	else	3628	else
3588	{	3629	{
3589	if (mode == 'r')	3630	if (mode == 'r')
…		…
3799	}	3840	}
3800	}	3841	}
3801	/}}} /	3842	/}}} /
3802		3843
3803	/{{{ process sgr sequences /	3844	/{{{ process sgr sequences /
3804	void	3845	void ecb_hot
3805	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3846	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3806	{	3847	{
3807	unsigned int i;	3848	unsigned int i;
3808	short rendset;	3849	short rendset;
3809	int rendstyle;	3850	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs. Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC