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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC vs.
Revision 1.517 by root, Wed Jun 6 08:59:13 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
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR \|\| !x)	152	if (t != NOCHAR \|\| !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
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, int y2)
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;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];	206	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
403	{	407	{
404	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
405	KeySym keysym;	409	KeySym keysym;
406	int valid_keysym;	410	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
423		427
424	kbuf[0] = 0;	428	kbuf[0] = 0;
425		429
426	#ifdef USE_XIM	430	#if USE_XIM
427	if (Input_Context)	431	if (Input_Context)
428	{	432	{
429	Status status_return;	433	Status status_return;
430		434
431	#if 0	435	#if 0
…		…
776	}	780	}
777		781
778	if (newlen)	782	if (newlen)
779	len = strlen (kbuf);	783	len = strlen (kbuf);
780		784
		785	if (len > 0)
		786	{
781	/*	787	/*
		788	* pass Shift/Control indicators for function keys ending with `~'
		789	*
		790	* eg,
		791	* Prior = "ESC[5~"
		792	* Shift+Prior = "ESC[5$"
		793	* Ctrl+Prior = "ESC[5^"
		794	* Ctrl+Shift+Prior = "ESC[5@"
		795	*/
		796	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		797	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		798
		799	/*
782	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
783	*/	801	*/
784	#ifdef META8_OPTION	802	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
787	#endif	805	#endif
		806	}
788		807
789	}	808	}
790	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
791	{	810	{
792	len = 1;	811	len = 1;
…		…
826	{	845	{
827	view_start = 0;	846	view_start = 0;
828	want_refresh = 1;	847	want_refresh = 1;
829	}	848	}
830		849
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 */	850	/* escape prefix */
846	if (meta	851	if (meta
847	#ifdef META8_OPTION	852	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
849	#endif	854	#endif
…		…
854	}	859	}
855		860
856	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
857	}	862	}
858		863
859	void	864	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
861	{	866	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	868	KeySym keysym;
864		869
…		…
986	while (row < end_row);	991	while (row < end_row);
987	}	992	}
988		993
989	scr_refresh ();	994	scr_refresh ();
990	scrollBar.show (1);	995	scrollBar.show (1);
991	#ifdef USE_XIM	996	#if USE_XIM
992	im_send_spot ();	997	im_send_spot ();
993	#endif	998	#endif
994	}	999	}
995		1000
996	display->flush ();	1001	display->flush ();
…		…
1014	refresh_count = 0;	1019	refresh_count = 0;
1015	flush ();	1020	flush ();
1016	}	1021	}
1017		1022
1018	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
		1024	void
		1025	rxvt_term::cursor_blink_reset ()
		1026	{
		1027	if (hidden_cursor)
		1028	{
		1029	hidden_cursor = 0;
		1030	want_refresh = 1;
		1031	}
		1032
		1033	if (option (Opt_cursorBlink))
		1034	cursor_blink_ev.again ();
		1035	else
		1036	cursor_blink_ev.stop ();
		1037	}
		1038
1019	void	1039	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1041	{
1022	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1043	want_refresh = 1;
…		…
1203	pty_write ();	1223	pty_write ();
1204		1224
1205	refresh_check ();	1225	refresh_check ();
1206	}	1226	}
1207		1227
1208	void	1228	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1210	{	1230	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1232	recolour_cursor ();
1213		1233
…		…
1218	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1219	#endif	1239	#endif
1220	}	1240	}
1221		1241
1222	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1223	void	1243	void ecb_cold
1224	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1225	{	1245	{
1226	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1227	return;	1247	return;
1228		1248
…		…
1230	XFlush (dpy);	1250	XFlush (dpy);
1231		1251
1232	hidden_pointer = 1;	1252	hidden_pointer = 1;
1233	}	1253	}
1234		1254
1235	void	1255	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1257	{
1238	make_current ();	1258	make_current ();
1239		1259
1240	pointer_blank ();	1260	pointer_blank ();
…		…
1332	32 + x,	1352	32 + x,
1333	32 + y);	1353	32 + y);
1334	}	1354	}
1335		1355
1336	/{{{ process an X event /	1356	/{{{ process an X event /
1337	void	1357	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1339	{	1359	{
1340	make_current ();	1360	make_current ();
1341		1361
1342	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1446	{	1466	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1468	;
1449		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
1450	#ifdef HAVE_BG_PIXMAP	1472	#ifdef HAVE_BG_PIXMAP
		1473	if (bg_window_position_sensitive ())
		1474	want_position_change = true;
		1475	#endif
		1476
1451	bool moved = false;	1477	bool moved = false;
1452	if (bg_window_position_sensitive ())	1478
		1479	if (want_position_change)
1453	{	1480	{
1454	int x, y;	1481	int x, y;
		1482
1455	if (ev.xconfigure.send_event)	1483	if (ev.xconfigure.send_event)
1456	{	1484	{
1457	x = ev.xconfigure.x;	1485	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1486	y = ev.xconfigure.y;
1459	}	1487	}
1460	else	1488	else
1461	get_window_origin (x, y);	1489	get_window_origin (x, y);
1462		1490
		1491	if (x != parent_x \|\| y != parent_y)
		1492	{
		1493	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1494	parent_x = x;
		1495	parent_y = y;
		1496	}
		1497
1463	if (bg_set_position (x, y)	1498	if (bg_set_position (x, y)
1464	\|\| !(bg_flags & BG_IS_VALID))	1499	\|\| !(bg_flags & BG_IS_VALID))
1465	moved = true;	1500	moved = true;
1466	}	1501	}
1467	#endif
1468		1502
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1504	{
1471	seen_resize = 1;	1505	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1633	dist = int_bwidth - ev.xbutton.y;	1667	dist = int_bwidth - ev.xbutton.y;
1634	}	1668	}
1635	else	1669	else
1636	{	1670	{
1637	scroll_selection_dir = DN;	1671	scroll_selection_dir = DN;
1638	dist = ev.xbutton.y - (int_bwidth + height);	1672	dist = ev.xbutton.y - (int_bwidth + vt_height);
1639	}	1673	}
1640		1674
1641	scroll_selection_lines = Pixel2Height (dist)	1675	scroll_selection_lines = Pixel2Height (dist)
1642	/ SELECTION_SCROLL_LINE_SPEEDUP	1676	/ SELECTION_SCROLL_LINE_SPEEDUP
1643	+ 1;	1677	+ 1;
…		…
1675	}	1709	}
1676	break;	1710	break;
1677	}	1711	}
1678		1712
1679	#if defined(CURSOR_BLINK)	1713	#if defined(CURSOR_BLINK)
1680	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1714	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 ();	1715	cursor_blink_reset ();
1689	}
1690	#endif	1716	#endif
1691		1717
1692	#if defined(POINTER_BLANK)	1718	#if defined(POINTER_BLANK)
1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1719	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694	{	1720	{
…		…
1705		1731
1706	refresh_check ();	1732	refresh_check ();
1707	}	1733	}
1708		1734
1709	#if ENABLE_FRILLS	1735	#if ENABLE_FRILLS
1710	void	1736	void ecb_cold
1711	rxvt_term::set_urgency (bool enable)	1737	rxvt_term::set_urgency (bool enable)
1712	{	1738	{
1713	if (enable == urgency_hint)	1739	if (enable == urgency_hint)
1714	return;	1740	return;
1715		1741
1716	if (XWMHints *h = XGetWMHints (dpy, parent))	1742	if (XWMHints *h = XGetWMHints (dpy, parent))
1717	{	1743	{
1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1744	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1719	XSetWMHints (dpy, parent, h);	1745	XSetWMHints (dpy, parent, h);
1720	urgency_hint = enable;	1746	urgency_hint = enable;
		1747	XFree (h);
1721	}	1748	}
1722	}	1749	}
1723	#endif	1750	#endif
1724		1751
1725	void	1752	void ecb_cold
1726	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1727	{	1754	{
1728	if (!focus)	1755	if (!focus)
1729	{	1756	{
1730	focus = 1;	1757	focus = 1;
…		…
1755		1782
1756	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1783	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757	}	1784	}
1758	}	1785	}
1759		1786
1760	void	1787	void ecb_cold
1761	rxvt_term::focus_out ()	1788	rxvt_term::focus_out ()
1762	{	1789	{
1763	if (focus)	1790	if (focus)
1764	{	1791	{
1765	focus = 0;	1792	focus = 0;
…		…
1798		1825
1799	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1826	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800	}	1827	}
1801	}	1828	}
1802		1829
1803	void	1830	void ecb_cold
1804	rxvt_term::update_fade_color (unsigned int idx)	1831	rxvt_term::update_fade_color (unsigned int idx)
1805	{	1832	{
1806	#if OFF_FOCUS_FADING	1833	#if OFF_FOCUS_FADING
1807	if (rs[Rs_fade])	1834	if (rs[Rs_fade])
1808	{	1835	{
…		…
1812	}	1839	}
1813	#endif	1840	#endif
1814	}	1841	}
1815		1842
1816	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1843	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1817	void	1844	void ecb_hot
1818	rxvt_term::rootwin_cb (XEvent &ev)	1845	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1846	{
1820	make_current ();	1847	make_current ();
1821		1848
1822	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1849	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1850	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824	return;	1851	return;
1825		1852
1826	# if ENABLE_TRANSPARENCY
1827	switch (ev.type)	1853	switch (ev.type)
1828	{	1854	{
1829	case PropertyNotify:	1855	case PropertyNotify:
1830	/*	1856	/*
1831	* if user used some Esetroot compatible prog to set the root bg,	1857	* if user used some Esetroot compatible prog to set the root bg,
1832	* use the property to determine the pixmap. We use it later on.	1858	* use the property to determine the pixmap. We use it later on.
1833	*/	1859	*/
1834	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1860	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1861	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836	{	1862	{
		1863	# if ENABLE_TRANSPARENCY
1837	bg_set_root_pixmap ();	1864	bg_set_root_pixmap ();
1838	update_background ();	1865	update_background ();
		1866	#endif
		1867	#if ENABLE_PERL
		1868	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1869	#endif
1839	}	1870	}
1840		1871
1841	break;	1872	break;
1842	}	1873	}
1843	# endif
1844		1874
1845	refresh_check ();	1875	refresh_check ();
1846	}	1876	}
1847	#endif	1877	#endif
1848		1878
…		…
2161	case Button3:	2191	case Button3:
2162	selection_make (ev.time);	2192	selection_make (ev.time);
2163	break;	2193	break;
2164		2194
2165	case Button2:	2195	case Button2:
2166	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2196	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2197	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168	break;	2198	break;
2169		2199
2170	#ifdef MOUSE_WHEEL	2200	#ifdef MOUSE_WHEEL
2171	case Button4:	2201	case Button4:
…		…
2206	}	2236	}
2207	}	2237	}
2208		2238
2209	/}}} /	2239	/}}} /
2210		2240
2211	void	2241	void ecb_hot
2212	rxvt_term::cmd_parse ()	2242	rxvt_term::cmd_parse ()
2213	{	2243	{
2214	wchar_t ch = NOCHAR;	2244	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2245	char *seq_begin; // remember start of esc-sequence here
2216		2246
…		…
2335	}	2365	}
2336	}	2366	}
2337	}	2367	}
2338		2368
2339	// read the next character	2369	// read the next character
2340	wchar_t	2370	wchar_t ecb_hot
2341	rxvt_term::next_char () NOTHROW	2371	rxvt_term::next_char () NOTHROW
2342	{	2372	{
2343	while (cmdbuf_ptr < cmdbuf_endp)	2373	while (cmdbuf_ptr < cmdbuf_endp)
2344	{	2374	{
2345	// assume 7-bit to be ascii ALWAYS	2375	// assume 7-bit to be ascii ALWAYS
…		…
2369		2399
2370	return NOCHAR;	2400	return NOCHAR;
2371	}	2401	}
2372		2402
2373	// read the next octet	2403	// read the next octet
2374	uint32_t	2404	uint32_t ecb_hot
2375	rxvt_term::next_octet () NOTHROW	2405	rxvt_term::next_octet () NOTHROW
2376	{	2406	{
2377	return cmdbuf_ptr < cmdbuf_endp	2407	return cmdbuf_ptr < cmdbuf_endp
2378	? (unsigned char)*cmdbuf_ptr++	2408	? (unsigned char)*cmdbuf_ptr++
2379	: NOCHAR;	2409	: NOCHAR;
2380	}	2410	}
2381		2411
2382	static class out_of_input out_of_input;	2412	static class out_of_input out_of_input;
2383		2413
2384	wchar_t	2414	wchar_t ecb_hot
2385	rxvt_term::cmd_getc () THROW ((class out_of_input))	2415	rxvt_term::cmd_getc () THROW ((class out_of_input))
2386	{	2416	{
2387	wchar_t c = next_char ();	2417	wchar_t c = next_char ();
2388		2418
2389	if (c == NOCHAR)	2419	if (c == NOCHAR)
2390	throw out_of_input;	2420	throw out_of_input;
2391		2421
2392	return c;	2422	return c;
2393	}	2423	}
2394		2424
2395	uint32_t	2425	uint32_t ecb_hot
2396	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2426	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397	{	2427	{
2398	uint32_t c = next_octet ();	2428	uint32_t c = next_octet ();
2399		2429
2400	if (c == NOCHAR)	2430	if (c == NOCHAR)
…		…
2404	}	2434	}
2405		2435
2406	/{{{ print pipe /	2436	/{{{ print pipe /
2407	/----------------------------------------------------------------------/	2437	/----------------------------------------------------------------------/
2408	#ifdef PRINTPIPE	2438	#ifdef PRINTPIPE
2409	FILE *	2439	FILE * ecb_cold
2410	rxvt_term::popen_printer ()	2440	rxvt_term::popen_printer ()
2411	{	2441	{
2412	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2442	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413		2443
2414	if (stream == NULL)	2444	if (stream == NULL)
2415	rxvt_warn ("can't open printer pipe, not printing.\n");	2445	rxvt_warn ("can't open printer pipe, not printing.\n");
2416		2446
2417	return stream;	2447	return stream;
2418	}	2448	}
2419		2449
2420	int	2450	int ecb_cold
2421	rxvt_term::pclose_printer (FILE *stream)	2451	rxvt_term::pclose_printer (FILE *stream)
2422	{	2452	{
2423	fflush (stream);	2453	fflush (stream);
2424	return pclose (stream);	2454	return pclose (stream);
2425	}	2455	}
2426		2456
2427	/*	2457	/*
2428	* simulate attached vt100 printer	2458	* simulate attached vt100 printer
2429	*/	2459	*/
2430	void	2460	void ecb_cold
2431	rxvt_term::process_print_pipe ()	2461	rxvt_term::process_print_pipe ()
2432	{	2462	{
2433	FILE *fd = popen_printer ();	2463	FILE *fd = popen_printer ();
2434		2464
2435	if (!fd)	2465	if (!fd)
…		…
2490	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2520	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2521	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492	};	2522	};
2493		2523
2494	/{{{ process non-printing single characters /	2524	/{{{ process non-printing single characters /
2495	void	2525	void ecb_hot
2496	rxvt_term::process_nonprinting (unicode_t ch)	2526	rxvt_term::process_nonprinting (unicode_t ch)
2497	{	2527	{
2498	switch (ch)	2528	switch (ch)
2499	{	2529	{
2500	case C0_ESC:	2530	case C0_ESC:
…		…
2546	}	2576	}
2547	/}}} /	2577	/}}} /
2548		2578
2549		2579
2550	/{{{ process VT52 escape sequences /	2580	/{{{ process VT52 escape sequences /
2551	void	2581	void ecb_cold
2552	rxvt_term::process_escape_vt52 (unicode_t ch)	2582	rxvt_term::process_escape_vt52 (unicode_t ch)
2553	{	2583	{
2554	int row, col;	2584	int row, col;
2555		2585
2556	switch (ch)	2586	switch (ch)
…		…
2606	}	2636	}
2607	/}}} /	2637	/}}} /
2608		2638
2609		2639
2610	/{{{ process escape sequences /	2640	/{{{ process escape sequences /
2611	void	2641	void ecb_hot
2612	rxvt_term::process_escape_seq ()	2642	rxvt_term::process_escape_seq ()
2613	{	2643	{
2614	unicode_t ch = cmd_getc ();	2644	unicode_t ch = cmd_getc ();
2615		2645
2616	if (priv_modes & PrivMode_vt52)	2646	if (priv_modes & PrivMode_vt52)
…		…
2768	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2798	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2799	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2800	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2771	};	2801	};
2772		2802
2773	void	2803	void ecb_hot
2774	rxvt_term::process_csi_seq ()	2804	rxvt_term::process_csi_seq ()
2775	{	2805	{
2776	unicode_t ch, priv, i;	2806	unicode_t ch, priv, i;
2777	unsigned int nargs, p;	2807	unsigned int nargs, p;
2778	int n, ndef;	2808	int n, ndef;
…		…
2885	}	2915	}
2886	break;	2916	break;
2887	#endif	2917	#endif
2888		2918
2889	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2892	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2893	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2896	break;	2926	break;
2897		2927
2898	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3132	break;	3162	break;
3133		3163
3134	//case 9: NYI, TODO, restore maximized window or maximize window	3164	//case 9: NYI, TODO, restore maximized window or maximize window
3135	default:	3165	default:
3136	if (args[0] >= 24) /* set height (chars) */	3166	if (args[0] >= 24) /* set height (chars) */
3137	set_widthheight ((unsigned int)width,	3167	set_widthheight ((unsigned int)vt_width,
3138	(unsigned int) (args[1] * fheight));	3168	(unsigned int) (args[1] * fheight));
3139	break;	3169	break;
3140		3170
3141	/*	3171	/*
3142	* reports - some output format copied from XTerm	3172	* reports - some output format copied from XTerm
…		…
3428	process_color_seq (op, Color_tint, str, resp);	3458	process_color_seq (op, Color_tint, str, resp);
3429	{	3459	{
3430	bool changed = false;	3460	bool changed = false;
3431		3461
3432	if (ISSET_PIXCOLOR (Color_tint))	3462	if (ISSET_PIXCOLOR (Color_tint))
3433	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3463	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434		3464
3435	if (changed)	3465	if (changed)
3436	update_background ();	3466	update_background ();
3437	}	3467	}
3438		3468
…		…
3442	#if BG_IMAGE_FROM_FILE	3472	#if BG_IMAGE_FROM_FILE
3443	case Rxvt_Pixmap:	3473	case Rxvt_Pixmap:
3444	if (!strcmp (str, "?"))	3474	if (!strcmp (str, "?"))
3445	{	3475	{
3446	char str[256];	3476	char str[256];
		3477	int h_scale = 0, v_scale = 0;
		3478	int h_align = 0, v_align = 0;
		3479	if (image_vec.size () > 0)
		3480	{
		3481	h_scale = image_vec[0].h_scale;
		3482	v_scale = image_vec[0].v_scale;
		3483	h_align = image_vec[0].h_align;
		3484	v_align = image_vec[0].v_align;
		3485	}
3447		3486
3448	sprintf (str, "[%dx%d+%d+%d]",	3487	sprintf (str, "[%dx%d+%d+%d]",
3449	min (h_scale, 32767), min (v_scale, 32767),	3488	h_scale, v_scale,
3450	min (h_align, 32767), min (v_align, 32767));	3489	h_align, v_align);
3451	process_xterm_seq (XTerm_title, str, CHAR_ST);	3490	process_xterm_seq (XTerm_title, str, CHAR_ST);
3452	}	3491	}
3453	else	3492	else
3454	{	3493	{
3455	bool changed = false;	3494	bool changed = false;
3456		3495
3457	if (*str != ';')	3496	if (*str != ';')
3458	{	3497	{
3459	if (bg_set_file (str)) /* change pixmap */	3498	if (image_vec.size () > 0)
		3499	changed = image_vec[0].set_file_geometry (str);
		3500	else
		3501	{
		3502	rxvt_image *image = new_image ();
		3503	if (!image->set_file_geometry (str))
		3504	image_vec.pop_back ();
		3505	else
3460	changed = true;	3506	changed = true;
		3507	}
3461	}	3508	}
3462	else	3509	else
3463	{	3510	{
3464	str++;	3511	str++;
		3512	if (image_vec.size () > 0)
3465	if (bg_set_geometry (str, true))	3513	changed = image_vec[0].set_geometry (str, true);
3466	changed = true;
3467	}	3514	}
3468		3515
3469	if (changed)	3516	if (changed)
3470	{	3517	{
3471	if (bg_window_position_sensitive ())	3518	if (bg_window_position_sensitive ())
…		…
3570	* 's' = save	3617	* 's' = save
3571	* 'r' = restore	3618	* 'r' = restore
3572	* 't' = toggle	3619	* 't' = toggle
3573	* so no need for fancy checking	3620	* so no need for fancy checking
3574	*/	3621	*/
3575	int	3622	int ecb_cold
3576	rxvt_term::privcases (int mode, unsigned long bit)	3623	rxvt_term::privcases (int mode, unsigned long bit)
3577	{	3624	{
3578	int state;	3625	int state;
3579		3626
3580	if (mode == 's')	3627	if (mode == 's')
3581	{	3628	{
3582	SavedModes \|= (priv_modes & bit);	3629	if (priv_modes & bit)
		3630	SavedModes \|= bit;
		3631	else
		3632	SavedModes &= ~bit;
3583	return -1;	3633	return -1;
3584	}	3634	}
3585	else	3635	else
3586	{	3636	{
3587	if (mode == 'r')	3637	if (mode == 'r')
…		…
3797	}	3847	}
3798	}	3848	}
3799	/}}} /	3849	/}}} /
3800		3850
3801	/{{{ process sgr sequences /	3851	/{{{ process sgr sequences /
3802	void	3852	void ecb_hot
3803	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3853	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804	{	3854	{
3805	unsigned int i;	3855	unsigned int i;
3806	short rendset;	3856	short rendset;
3807	int rendstyle;	3857	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC vs. Revision 1.517 by root, Wed Jun 6 08:59:13 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC vs.
Revision 1.517 by root, Wed Jun 6 08:59:13 2012 UTC