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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.510 by sf-exg, Fri May 25 08:27:47 2012 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
…		…
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
…		…
855	}	859	}
856		860
857	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
858	}	862	}
859		863
860	void	864	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
862	{	866	{
863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
864	KeySym keysym;	868	KeySym keysym;
865		869
…		…
937	void	941	void
938	rxvt_term::flush ()	942	rxvt_term::flush ()
939	{	943	{
940	flush_ev.stop ();	944	flush_ev.stop ();
941		945
942	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
944	{	948	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	950	scr_touch (false);
947	}	951	}
…		…
987	while (row < end_row);	991	while (row < end_row);
988	}	992	}
989		993
990	scr_refresh ();	994	scr_refresh ();
991	scrollBar.show (1);	995	scrollBar.show (1);
992	#ifdef USE_XIM	996	#if USE_XIM
993	im_send_spot ();	997	im_send_spot ();
994	#endif	998	#endif
995	}	999	}
996		1000
997	display->flush ();	1001	display->flush ();
…		…
1219	pty_write ();	1223	pty_write ();
1220		1224
1221	refresh_check ();	1225	refresh_check ();
1222	}	1226	}
1223		1227
1224	void	1228	void ecb_cold
1225	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1226	{	1230	{
1227	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1228	recolour_cursor ();	1232	recolour_cursor ();
1229		1233
…		…
1234	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1235	#endif	1239	#endif
1236	}	1240	}
1237		1241
1238	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1239	void	1243	void ecb_cold
1240	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1241	{	1245	{
1242	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1243	return;	1247	return;
1244		1248
…		…
1246	XFlush (dpy);	1250	XFlush (dpy);
1247		1251
1248	hidden_pointer = 1;	1252	hidden_pointer = 1;
1249	}	1253	}
1250		1254
1251	void	1255	void ecb_cold
1252	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1253	{	1257	{
1254	make_current ();	1258	make_current ();
1255		1259
1256	pointer_blank ();	1260	pointer_blank ();
…		…
1348	32 + x,	1352	32 + x,
1349	32 + y);	1353	32 + y);
1350	}	1354	}
1351		1355
1352	/{{{ process an X event /	1356	/{{{ process an X event /
1353	void	1357	void ecb_hot
1354	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1355	{	1359	{
1356	make_current ();	1360	make_current ();
1357		1361
1358	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1461	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1462	{	1466	{
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1468	;
1465		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1466	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1467	bool moved = false;
1468	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1469	{	1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1470	int x, y;	1484	int x, y;
		1485
1471	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1472	{	1487	{
1473	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1474	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1475	}	1490	}
1476	else	1491	else
1477	get_window_origin (x, y);	1492	get_window_origin (x, y);
1478		1493
1479	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1480	\|\| !(bg_flags & BG_IS_VALID))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481	moved = true;	1499	moved = true;
		1500	}
1482	}	1501	}
1483	#endif
1484		1502
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1504	{
1487	seen_resize = 1;	1505	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1511	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1512	break;	1530	break;
1513		1531
1514	case MapNotify:	1532	case MapNotify:
1515	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1516	/* This is needed specifically to fix the case of no window manager or a	1534	// This is needed at startup for the case of no window manager
1517	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1519	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1520	* reparenting.	1538	// events at startup when the window manager reparents the
1521	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1522	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1523	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1524	* bit of time for ConfigureNotifies to arrive.
1525	* We should render background PRIOR to drawing any text, but AFTER all
1526	* of ConfigureNotifys for the best results.
1527	*/
1528	if (!(bg_flags & BG_IS_VALID))
1529	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1530	#endif	1543	#endif
1531	mapped = 1;	1544	mapped = 1;
1532	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1533	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1713		1726
1714	refresh_check ();	1727	refresh_check ();
1715	}	1728	}
1716		1729
1717	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1718	void	1731	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1732	rxvt_term::set_urgency (bool enable)
1720	{	1733	{
1721	if (enable == urgency_hint)	1734	if (enable == urgency_hint)
1722	return;	1735	return;
1723		1736
…		…
1729	XFree (h);	1742	XFree (h);
1730	}	1743	}
1731	}	1744	}
1732	#endif	1745	#endif
1733		1746
1734	void	1747	void ecb_cold
1735	rxvt_term::focus_in ()	1748	rxvt_term::focus_in ()
1736	{	1749	{
1737	if (!focus)	1750	if (!focus)
1738	{	1751	{
1739	focus = 1;	1752	focus = 1;
…		…
1764		1777
1765	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1778	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766	}	1779	}
1767	}	1780	}
1768		1781
1769	void	1782	void ecb_cold
1770	rxvt_term::focus_out ()	1783	rxvt_term::focus_out ()
1771	{	1784	{
1772	if (focus)	1785	if (focus)
1773	{	1786	{
1774	focus = 0;	1787	focus = 0;
…		…
1807		1820
1808	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1821	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809	}	1822	}
1810	}	1823	}
1811		1824
1812	void	1825	void ecb_cold
1813	rxvt_term::update_fade_color (unsigned int idx)	1826	rxvt_term::update_fade_color (unsigned int idx)
1814	{	1827	{
1815	#if OFF_FOCUS_FADING	1828	#if OFF_FOCUS_FADING
1816	if (rs[Rs_fade])	1829	if (rs[Rs_fade])
1817	{	1830	{
…		…
1820	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1833	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821	}	1834	}
1822	#endif	1835	#endif
1823	}	1836	}
1824		1837
1825	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1826	void	1839	void ecb_hot
1827	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1828	{	1841	{
1829	make_current ();	1842	make_current ();
1830		1843
1831	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1844	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1845	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833	return;	1846	return;
1834		1847
1835	# if ENABLE_TRANSPARENCY
1836	switch (ev.type)	1848	switch (ev.type)
1837	{	1849	{
1838	case PropertyNotify:	1850	case PropertyNotify:
1839	/*	1851	/*
1840	* if user used some Esetroot compatible prog to set the root bg,	1852	* if user used some Esetroot compatible prog to set the root bg,
1841	* use the property to determine the pixmap. We use it later on.	1853	* use the property to determine the pixmap. We use it later on.
1842	*/	1854	*/
1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	{	1857	{
1846	bg_set_root_pixmap ();	1858	#if BG_IMAGE_FROM_ROOT
		1859	if (option (Opt_transparent))
		1860	{
		1861	rxvt_img::new_from_root (this)->replace (root_img);
1847	update_background ();	1862	update_background ();
		1863	}
		1864	#endif
		1865	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848	}	1866	}
1849		1867
1850	break;	1868	break;
1851	}	1869	}
1852	# endif
1853		1870
1854	refresh_check ();	1871	refresh_check ();
1855	}	1872	}
1856	#endif	1873	#endif
1857		1874
…		…
2215	}	2232	}
2216	}	2233	}
2217		2234
2218	/}}} /	2235	/}}} /
2219		2236
2220	void	2237	void ecb_hot
2221	rxvt_term::cmd_parse ()	2238	rxvt_term::cmd_parse ()
2222	{	2239	{
2223	wchar_t ch = NOCHAR;	2240	wchar_t ch = NOCHAR;
2224	char *seq_begin; // remember start of esc-sequence here	2241	char *seq_begin; // remember start of esc-sequence here
2225		2242
…		…
2344	}	2361	}
2345	}	2362	}
2346	}	2363	}
2347		2364
2348	// read the next character	2365	// read the next character
2349	wchar_t	2366	wchar_t ecb_hot
2350	rxvt_term::next_char () NOTHROW	2367	rxvt_term::next_char () NOTHROW
2351	{	2368	{
2352	while (cmdbuf_ptr < cmdbuf_endp)	2369	while (cmdbuf_ptr < cmdbuf_endp)
2353	{	2370	{
2354	// assume 7-bit to be ascii ALWAYS	2371	// assume 7-bit to be ascii ALWAYS
…		…
2366	}	2383	}
2367		2384
2368	if (len == (size_t)-1)	2385	if (len == (size_t)-1)
2369	{	2386	{
2370	mbstate.reset (); // reset now undefined conversion state	2387	mbstate.reset (); // reset now undefined conversion state
		2388	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2389	// in which case we "erroneously" return the next byte which might be valid.
2371	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2390	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372	}	2391	}
2373		2392
2374	// assume wchar == unicode	2393	// assume wchar == unicode
2375	cmdbuf_ptr += len;	2394	cmdbuf_ptr += len;
…		…
2378		2397
2379	return NOCHAR;	2398	return NOCHAR;
2380	}	2399	}
2381		2400
2382	// read the next octet	2401	// read the next octet
2383	uint32_t	2402	uint32_t ecb_hot
2384	rxvt_term::next_octet () NOTHROW	2403	rxvt_term::next_octet () NOTHROW
2385	{	2404	{
2386	return cmdbuf_ptr < cmdbuf_endp	2405	return cmdbuf_ptr < cmdbuf_endp
2387	? (unsigned char)*cmdbuf_ptr++	2406	? (unsigned char)*cmdbuf_ptr++
2388	: NOCHAR;	2407	: NOCHAR;
2389	}	2408	}
2390		2409
2391	static class out_of_input out_of_input;	2410	static class out_of_input out_of_input;
2392		2411
2393	wchar_t	2412	wchar_t ecb_hot
2394	rxvt_term::cmd_getc () THROW ((class out_of_input))	2413	rxvt_term::cmd_getc () THROW ((class out_of_input))
2395	{	2414	{
2396	wchar_t c = next_char ();	2415	wchar_t c = next_char ();
2397		2416
2398	if (c == NOCHAR)	2417	if (c == NOCHAR)
2399	throw out_of_input;	2418	throw out_of_input;
2400		2419
2401	return c;	2420	return c;
2402	}	2421	}
2403		2422
2404	uint32_t	2423	uint32_t ecb_hot
2405	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2424	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2406	{	2425	{
2407	uint32_t c = next_octet ();	2426	uint32_t c = next_octet ();
2408		2427
2409	if (c == NOCHAR)	2428	if (c == NOCHAR)
…		…
2413	}	2432	}
2414		2433
2415	/{{{ print pipe /	2434	/{{{ print pipe /
2416	/----------------------------------------------------------------------/	2435	/----------------------------------------------------------------------/
2417	#ifdef PRINTPIPE	2436	#ifdef PRINTPIPE
2418	FILE *	2437	FILE * ecb_cold
2419	rxvt_term::popen_printer ()	2438	rxvt_term::popen_printer ()
2420	{	2439	{
2421	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2440	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2422		2441
2423	if (stream == NULL)	2442	if (stream == NULL)
2424	rxvt_warn ("can't open printer pipe, not printing.\n");	2443	rxvt_warn ("can't open printer pipe, not printing.\n");
2425		2444
2426	return stream;	2445	return stream;
2427	}	2446	}
2428		2447
2429	int	2448	int ecb_cold
2430	rxvt_term::pclose_printer (FILE *stream)	2449	rxvt_term::pclose_printer (FILE *stream)
2431	{	2450	{
2432	fflush (stream);	2451	fflush (stream);
2433	return pclose (stream);	2452	return pclose (stream);
2434	}	2453	}
2435		2454
2436	/*	2455	/*
2437	* simulate attached vt100 printer	2456	* simulate attached vt100 printer
2438	*/	2457	*/
2439	void	2458	void ecb_cold
2440	rxvt_term::process_print_pipe ()	2459	rxvt_term::process_print_pipe ()
2441	{	2460	{
2442	FILE *fd = popen_printer ();	2461	FILE *fd = popen_printer ();
2443		2462
2444	if (!fd)	2463	if (!fd)
…		…
2499	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2518	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2519	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501	};	2520	};
2502		2521
2503	/{{{ process non-printing single characters /	2522	/{{{ process non-printing single characters /
2504	void	2523	void ecb_hot
2505	rxvt_term::process_nonprinting (unicode_t ch)	2524	rxvt_term::process_nonprinting (unicode_t ch)
2506	{	2525	{
2507	switch (ch)	2526	switch (ch)
2508	{	2527	{
2509	case C0_ESC:	2528	case C0_ESC:
…		…
2555	}	2574	}
2556	/}}} /	2575	/}}} /
2557		2576
2558		2577
2559	/{{{ process VT52 escape sequences /	2578	/{{{ process VT52 escape sequences /
2560	void	2579	void ecb_cold
2561	rxvt_term::process_escape_vt52 (unicode_t ch)	2580	rxvt_term::process_escape_vt52 (unicode_t ch)
2562	{	2581	{
2563	int row, col;	2582	int row, col;
2564		2583
2565	switch (ch)	2584	switch (ch)
…		…
2615	}	2634	}
2616	/}}} /	2635	/}}} /
2617		2636
2618		2637
2619	/{{{ process escape sequences /	2638	/{{{ process escape sequences /
2620	void	2639	void ecb_hot
2621	rxvt_term::process_escape_seq ()	2640	rxvt_term::process_escape_seq ()
2622	{	2641	{
2623	unicode_t ch = cmd_getc ();	2642	unicode_t ch = cmd_getc ();
2624		2643
2625	if (priv_modes & PrivMode_vt52)	2644	if (priv_modes & PrivMode_vt52)
…		…
2777	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2796	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2797	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2798	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2780	};	2799	};
2781		2800
2782	void	2801	void ecb_hot
2783	rxvt_term::process_csi_seq ()	2802	rxvt_term::process_csi_seq ()
2784	{	2803	{
2785	unicode_t ch, priv, i;	2804	unicode_t ch, priv, prev_ch, i;
2786	unsigned int nargs, p;	2805	unsigned int nargs, p;
2787	int n, ndef;	2806	int n, ndef;
2788	int arg[ESC_ARGS] = { };	2807	int arg[ESC_ARGS] = { };
2789		2808
2790	nargs = 0;	2809	nargs = 0;
…		…
2796	/* '<' '=' '>' '?' '!' */	2815	/* '<' '=' '>' '?' '!' */
2797	priv = ch;	2816	priv = ch;
2798	ch = cmd_getc ();	2817	ch = cmd_getc ();
2799	}	2818	}
2800		2819
		2820	prev_ch = 0;
2801	/* read any numerical arguments */	2821	/* read any numerical arguments */
2802	for (n = -1; ch < CSI_ICH; )	2822	for (n = -1; ch < CSI_ICH; )
2803	{	2823	{
2804	if (isdigit (ch))	2824	if (isdigit (ch))
2805	{	2825	{
…		…
2815	n = -1;	2835	n = -1;
2816	}	2836	}
2817	else if (IS_CONTROL (ch))	2837	else if (IS_CONTROL (ch))
2818	process_nonprinting (ch);	2838	process_nonprinting (ch);
2819		2839
		2840	prev_ch = ch;
2820	ch = cmd_getc ();	2841	ch = cmd_getc ();
2821	}	2842	}
2822		2843
2823	if (ch > CSI_7F)	2844	if (ch > CSI_7F)
2824	return;	2845	return;
…		…
3058	scr_insert_mode (1);	3079	scr_insert_mode (1);
3059	else if (arg[0] == 20)	3080	else if (arg[0] == 20)
3060	priv_modes \|= PrivMode_LFNL;	3081	priv_modes \|= PrivMode_LFNL;
3061	break;	3082	break;
3062		3083
		3084	case CSI_71: // DESCUSR: set cursor style
		3085	if (prev_ch == ' ')
		3086	set_cursor_style (arg[0]);
		3087	break;
		3088
3063	/*	3089	/*
3064	* PRIVATE USE beyond this point. All CSI_7? sequences here	3090	* PRIVATE USE beyond this point. All CSI_7? sequences here
3065	*/	3091	*/
3066	case CSI_72: /* DECSTBM: set top and bottom margins */	3092	case CSI_72: /* DECSTBM: set top and bottom margins */
3067	if (nargs == 1)	3093	if (nargs == 1)
…		…
3430	break;	3456	break;
3431	#endif	3457	#endif
3432	case URxvt_Color_border:	3458	case URxvt_Color_border:
3433	process_color_seq (op, Color_border, str, resp);	3459	process_color_seq (op, Color_border, str, resp);
3434	break;	3460	break;
3435	#if ENABLE_TRANSPARENCY	3461
		3462	#if BG_IMAGE_FROM_ROOT
3436	case URxvt_Color_tint:	3463	case URxvt_Color_tint:
3437	process_color_seq (op, Color_tint, str, resp);	3464	process_color_seq (op, Color_tint, str, resp);
3438	{	3465	{
3439	bool changed = false;	3466	bool changed = false;
3440		3467
3441	if (ISSET_PIXCOLOR (Color_tint))	3468	if (ISSET_PIXCOLOR (Color_tint))
3442	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3469	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443		3470
3444	if (changed)	3471	if (changed)
3445	update_background ();	3472	update_background ();
3446	}	3473	}
3447		3474
…		…
3451	#if BG_IMAGE_FROM_FILE	3478	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3479	case Rxvt_Pixmap:
3453	if (!strcmp (str, "?"))	3480	if (!strcmp (str, "?"))
3454	{	3481	{
3455	char str[256];	3482	char str[256];
3456	int h_scale = 0, v_scale = 0;
3457	int h_align = 0, v_align = 0;
3458	if (image_vec.size () > 0)
3459	{
3460	h_scale = image_vec[0].h_scale;	3483	int h_scale = fimage.h_scale;
3461	v_scale = image_vec[0].v_scale;	3484	int v_scale = fimage.v_scale;
3462	h_align = image_vec[0].h_align;	3485	int h_align = fimage.h_align;
3463	v_align = image_vec[0].v_align;	3486	int v_align = fimage.v_align;
3464	}
3465		3487
3466	sprintf (str, "[%dx%d+%d+%d]",	3488	sprintf (str, "[%dx%d+%d+%d]",
3467	h_scale, v_scale,	3489	h_scale, v_scale,
3468	h_align, v_align);	3490	h_align, v_align);
3469	process_xterm_seq (XTerm_title, str, CHAR_ST);	3491	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3472	{	3494	{
3473	bool changed = false;	3495	bool changed = false;
3474		3496
3475	if (*str != ';')	3497	if (*str != ';')
3476	{	3498	{
3477	if (image_vec.size () > 0
3478	&& image_vec[0].set_file_geometry (str))
3479	changed = true;
3480	else	3499	try
3481	{	3500	{
3482	rxvt_image *image = new_image ();
3483	if (!image->set_file_geometry (str))	3501	fimage.set_file_geometry (this, str);
3484	image_vec.pop_back ();
3485	else
3486	changed = true;	3502	changed = true;
		3503	}
		3504	catch (const class rxvt_failure_exception &e)
		3505	{
3487	}	3506	}
3488	}	3507	}
3489	else	3508	else
3490	{	3509	{
3491	str++;	3510	str++;
3492	if (image_vec.size () > 0
3493	&& image_vec[0].set_geometry (str, true))	3511	if (fimage.set_geometry (str, true))
3494	changed = true;	3512	changed = true;
3495	}	3513	}
3496		3514
3497	if (changed)	3515	if (changed)
3498	{	3516	{
3499	if (bg_window_position_sensitive ())	3517	if (bg_window_position_sensitive ())
3500	{	3518	{
3501	int x, y;	3519	int x, y;
3502	get_window_origin (x, y);	3520	get_window_origin (x, y);
3503	bg_set_position (x, y);	3521	parent_x = x;
		3522	parent_y = y;
3504	}	3523	}
3505	update_background ();	3524	update_background ();
3506	}	3525	}
3507	}	3526	}
3508	break;	3527	break;
…		…
3598	* 's' = save	3617	* 's' = save
3599	* 'r' = restore	3618	* 'r' = restore
3600	* 't' = toggle	3619	* 't' = toggle
3601	* so no need for fancy checking	3620	* so no need for fancy checking
3602	*/	3621	*/
3603	int	3622	int ecb_cold
3604	rxvt_term::privcases (int mode, unsigned long bit)	3623	rxvt_term::privcases (int mode, unsigned long bit)
3605	{	3624	{
3606	int state;	3625	int state;
3607		3626
3608	if (mode == 's')	3627	if (mode == 's')
…		…
3828	}	3847	}
3829	}	3848	}
3830	/}}} /	3849	/}}} /
3831		3850
3832	/{{{ process sgr sequences /	3851	/{{{ process sgr sequences /
3833	void	3852	void ecb_hot
3834	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3853	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3835	{	3854	{
3836	unsigned int i;	3855	unsigned int i;
3837	short rendset;	3856	short rendset;
3838	int rendstyle;	3857	int rendstyle;
…		…
3979	break;	3998	break;
3980	#endif	3999	#endif
3981	}	4000	}
3982	}	4001	}
3983	}	4002	}
		4003
		4004	void
		4005	rxvt_term::set_cursor_style (int style)
		4006	{
		4007	if (!IN_RANGE_INC (style, 0, 4))
		4008	return;
		4009
		4010	set_option (Opt_cursorUnderline, style >= 3);
		4011
		4012	#ifdef CURSOR_BLINK
		4013	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4014	cursor_blink_reset ();
		4015	#endif
		4016
		4017	want_refresh = 1;
		4018	}
3984	/}}} /	4019	/}}} /
3985		4020
3986	/* ------------------------------------------------------------------------- */	4021	/* ------------------------------------------------------------------------- */
3987		4022
3988	/*	4023	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.510 by sf-exg, Fri May 25 08:27:47 2012 UTC vs. Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.510 by sf-exg, Fri May 25 08:27:47 2012 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC