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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.516 by root, Tue Jun 5 14:46:54 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>
…		…
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 ecb_cold	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)
…		…
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	}
…		…
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1468	;
1465		1469
1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);	1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467		1471
		1472	bool moved = false;
1468	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1469	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
		1475	{
1470	want_position_change = true;	1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
1471	#endif	1480	#endif
1472
1473	bool moved = false;
1474		1481
1475	if (want_position_change)	1482	if (want_position_change)
1476	{	1483	{
1477	int x, y;	1484	int x, y;
1478		1485
…		…
1484	else	1491	else
1485	get_window_origin (x, y);	1492	get_window_origin (x, y);
1486		1493
1487	if (x != parent_x \|\| y != parent_y)	1494	if (x != parent_x \|\| y != parent_y)
1488	{	1495	{
1489	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490	parent_x = x;	1496	parent_x = x;
1491	parent_y = y;	1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1499	moved = true;
1492	}	1500	}
1493
1494	if (bg_set_position (x, y)
1495	\|\| !(bg_flags & BG_IS_VALID))
1496	moved = true;
1497	}	1501	}
1498		1502
1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1500	{	1504	{
1501	seen_resize = 1;	1505	seen_resize = 1;
…		…
1525	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1526	break;	1530	break;
1527		1531
1528	case MapNotify:	1532	case MapNotify:
1529	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1530	/* 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
1531	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1532	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1533	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1534	* reparenting.	1538	// events at startup when the window manager reparents the
1535	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1536	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1537	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1538	* bit of time for ConfigureNotifies to arrive.
1539	* We should render background PRIOR to drawing any text, but AFTER all
1540	* of ConfigureNotifys for the best results.
1541	*/
1542	if (!(bg_flags & BG_IS_VALID))
1543	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1544	#endif	1543	#endif
1545	mapped = 1;	1544	mapped = 1;
1546	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1547	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1834	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);
1835	}	1834	}
1836	#endif	1835	#endif
1837	}	1836	}
1838		1837
1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1840	void ecb_hot	1839	void ecb_hot
1841	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1842	{	1841	{
1843	make_current ();	1842	make_current ();
1844		1843
…		…
1854	* 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.
1855	*/	1854	*/
1856	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1857	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1858	{	1857	{
1859	# if ENABLE_TRANSPARENCY	1858	#if BG_IMAGE_FROM_ROOT
1860	bg_set_root_pixmap ();	1859	if (option (Opt_transparent))
		1860	{
		1861	rxvt_img::new_from_root (this)->replace (root_img);
1861	update_background ();	1862	update_background ();
		1863	}
1862	#endif	1864	#endif
1863	#if ENABLE_PERL
1864	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));	1865	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865	#endif
1866	}	1866	}
1867		1867
1868	break;	1868	break;
1869	}	1869	}
1870		1870
…		…
2383	}	2383	}
2384		2384
2385	if (len == (size_t)-1)	2385	if (len == (size_t)-1)
2386	{	2386	{
2387	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.
2388	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
2389	}	2391	}
2390		2392
2391	// assume wchar == unicode	2393	// assume wchar == unicode
2392	cmdbuf_ptr += len;	2394	cmdbuf_ptr += len;
…		…
2797	};	2799	};
2798		2800
2799	void ecb_hot	2801	void ecb_hot
2800	rxvt_term::process_csi_seq ()	2802	rxvt_term::process_csi_seq ()
2801	{	2803	{
2802	unicode_t ch, priv, i;	2804	unicode_t ch, priv, prev_ch, i;
2803	unsigned int nargs, p;	2805	unsigned int nargs, p;
2804	int n, ndef;	2806	int n, ndef;
2805	int arg[ESC_ARGS] = { };	2807	int arg[ESC_ARGS] = { };
2806		2808
2807	nargs = 0;	2809	nargs = 0;
…		…
2813	/* '<' '=' '>' '?' '!' */	2815	/* '<' '=' '>' '?' '!' */
2814	priv = ch;	2816	priv = ch;
2815	ch = cmd_getc ();	2817	ch = cmd_getc ();
2816	}	2818	}
2817		2819
		2820	prev_ch = 0;
2818	/* read any numerical arguments */	2821	/* read any numerical arguments */
2819	for (n = -1; ch < CSI_ICH; )	2822	for (n = -1; ch < CSI_ICH; )
2820	{	2823	{
2821	if (isdigit (ch))	2824	if (isdigit (ch))
2822	{	2825	{
…		…
2832	n = -1;	2835	n = -1;
2833	}	2836	}
2834	else if (IS_CONTROL (ch))	2837	else if (IS_CONTROL (ch))
2835	process_nonprinting (ch);	2838	process_nonprinting (ch);
2836		2839
		2840	prev_ch = ch;
2837	ch = cmd_getc ();	2841	ch = cmd_getc ();
2838	}	2842	}
2839		2843
2840	if (ch > CSI_7F)	2844	if (ch > CSI_7F)
2841	return;	2845	return;
…		…
3075	scr_insert_mode (1);	3079	scr_insert_mode (1);
3076	else if (arg[0] == 20)	3080	else if (arg[0] == 20)
3077	priv_modes \|= PrivMode_LFNL;	3081	priv_modes \|= PrivMode_LFNL;
3078	break;	3082	break;
3079		3083
		3084	case CSI_71: // DESCUSR: set cursor style
		3085	if (prev_ch == ' ')
		3086	set_cursor_style (arg[0]);
		3087	break;
		3088
3080	/*	3089	/*
3081	* PRIVATE USE beyond this point. All CSI_7? sequences here	3090	* PRIVATE USE beyond this point. All CSI_7? sequences here
3082	*/	3091	*/
3083	case CSI_72: /* DECSTBM: set top and bottom margins */	3092	case CSI_72: /* DECSTBM: set top and bottom margins */
3084	if (nargs == 1)	3093	if (nargs == 1)
…		…
3447	break;	3456	break;
3448	#endif	3457	#endif
3449	case URxvt_Color_border:	3458	case URxvt_Color_border:
3450	process_color_seq (op, Color_border, str, resp);	3459	process_color_seq (op, Color_border, str, resp);
3451	break;	3460	break;
3452	#if ENABLE_TRANSPARENCY	3461
		3462	#if BG_IMAGE_FROM_ROOT
3453	case URxvt_Color_tint:	3463	case URxvt_Color_tint:
3454	process_color_seq (op, Color_tint, str, resp);	3464	process_color_seq (op, Color_tint, str, resp);
3455	{	3465	{
3456	bool changed = false;	3466	bool changed = false;
3457		3467
…		…
3468	#if BG_IMAGE_FROM_FILE	3478	#if BG_IMAGE_FROM_FILE
3469	case Rxvt_Pixmap:	3479	case Rxvt_Pixmap:
3470	if (!strcmp (str, "?"))	3480	if (!strcmp (str, "?"))
3471	{	3481	{
3472	char str[256];	3482	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;	3483	int h_scale = fimage.h_scale;
3478	v_scale = image_vec[0].v_scale;	3484	int v_scale = fimage.v_scale;
3479	h_align = image_vec[0].h_align;	3485	int h_align = fimage.h_align;
3480	v_align = image_vec[0].v_align;	3486	int v_align = fimage.v_align;
3481	}
3482		3487
3483	sprintf (str, "[%dx%d+%d+%d]",	3488	sprintf (str, "[%dx%d+%d+%d]",
3484	h_scale, v_scale,	3489	h_scale, v_scale,
3485	h_align, v_align);	3490	h_align, v_align);
3486	process_xterm_seq (XTerm_title, str, CHAR_ST);	3491	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3489	{	3494	{
3490	bool changed = false;	3495	bool changed = false;
3491		3496
3492	if (*str != ';')	3497	if (*str != ';')
3493	{	3498	{
3494	if (image_vec.size () > 0)
3495	changed = image_vec[0].set_file_geometry (str);
3496	else	3499	try
3497	{	3500	{
3498	rxvt_image *image = new_image ();
3499	if (!image->set_file_geometry (str))	3501	fimage.set_file_geometry (this, str);
3500	image_vec.pop_back ();
3501	else
3502	changed = true;	3502	changed = true;
		3503	}
		3504	catch (const class rxvt_failure_exception &e)
		3505	{
3503	}	3506	}
3504	}	3507	}
3505	else	3508	else
3506	{	3509	{
3507	str++;	3510	str++;
3508	if (image_vec.size () > 0)
3509	changed = image_vec[0].set_geometry (str, true);	3511	if (fimage.set_geometry (str, true))
		3512	changed = true;
3510	}	3513	}
3511		3514
3512	if (changed)	3515	if (changed)
3513	{	3516	{
3514	if (bg_window_position_sensitive ())	3517	if (bg_window_position_sensitive ())
3515	{	3518	{
3516	int x, y;	3519	int x, y;
3517	get_window_origin (x, y);	3520	get_window_origin (x, y);
3518	bg_set_position (x, y);	3521	parent_x = x;
		3522	parent_y = y;
3519	}	3523	}
3520	update_background ();	3524	update_background ();
3521	}	3525	}
3522	}	3526	}
3523	break;	3527	break;
…		…
3994	break;	3998	break;
3995	#endif	3999	#endif
3996	}	4000	}
3997	}	4001	}
3998	}	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	}
3999	/}}} /	4019	/}}} /
4000		4020
4001	/* ------------------------------------------------------------------------- */	4021	/* ------------------------------------------------------------------------- */
4002		4022
4003	/*	4023	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.516 by root, Tue Jun 5 14:46:54 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.516 by root, Tue Jun 5 14:46:54 2012 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC