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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 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)
…		…
506	#endif	510	#endif
507	max_it (lnsppg, 1);	511	max_it (lnsppg, 1);
508		512
509	if (keysym == XK_Prior)	513	if (keysym == XK_Prior)
510	{	514	{
511	scr_page (UP, lnsppg);	515	scr_page (lnsppg);
512	return;	516	return;
513	}	517	}
514	else if (keysym == XK_Next)	518	else if (keysym == XK_Next)
515	{	519	{
516	scr_page (DN, lnsppg);	520	scr_page (-lnsppg);
517	return;	521	return;
518	}	522	}
519	}	523	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	524	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	525	if (IS_SCROLL_MOD)
522	{	526	{
523	if (keysym == XK_Up)	527	if (keysym == XK_Up)
524	{	528	{
525	scr_page (UP, 1);	529	scr_page (1);
526	return;	530	return;
527	}	531	}
528	else if (keysym == XK_Down)	532	else if (keysym == XK_Down)
529	{	533	{
530	scr_page (DN, 1);	534	scr_page (-1);
531	return;	535	return;
532	}	536	}
533	}	537	}
534	#endif	538	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	539	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	540	if (IS_SCROLL_MOD)
537	{	541	{
538	if (keysym == XK_Home)	542	if (keysym == XK_Home)
539	{	543	{
540	scr_move_to (0, 1);	544	scr_changeview (top_row);
541	return;	545	return;
542	}	546	}
543	else if (keysym == XK_End)	547	else if (keysym == XK_End)
544	{	548	{
545	scr_move_to (1, 1);	549	scr_changeview (0);
546	return;	550	return;
547	}	551	}
548	}	552	}
549	#endif	553	#endif
550	}	554	}
…		…
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	}
…		…
1073		1077
1074	#ifdef SELECTION_SCROLLING	1078	#ifdef SELECTION_SCROLLING
1075	void	1079	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1080	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1081	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1082	if (scr_page (scroll_selection_lines))
1079	{	1083	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1084	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1085	want_refresh = 1;
1082	refresh_check ();	1086	refresh_check ();
1083	}	1087	}
…		…
1088		1092
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1093	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1094	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1095	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1096	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1097	if (scr_page (mouse_slip_wheel_speed))
1094	{	1098	{
1095	want_refresh = 1;	1099	want_refresh = 1;
1096	refresh_check ();	1100	refresh_check ();
1097	}	1101	}
1098		1102
…		…
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 ();
…		…
1639		1638
1640	#ifdef SELECTION_SCROLLING	1639	#ifdef SELECTION_SCROLLING
1641	if (ev.xbutton.y < int_bwidth	1640	if (ev.xbutton.y < int_bwidth
1642	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1641	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1643	{	1642	{
		1643	page_dirn scroll_selection_dir;
1644	int dist;	1644	int dist;
1645		1645
1646	/* don't clobber the current delay if we are	1646	/* don't clobber the current delay if we are
1647	* already in the middle of scrolling.	1647	* already in the middle of scrolling.
1648	*/	1648	*/
…		…
1671	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1672	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1673	+ 1;	1673	+ 1;
1674	min_it (scroll_selection_lines,	1674	min_it (scroll_selection_lines,
1675	SELECTION_SCROLL_MAX_LINES);	1675	SELECTION_SCROLL_MAX_LINES);
		1676	scroll_selection_lines *= scroll_selection_dir;
1676	}	1677	}
1677	else	1678	else
1678	{	1679	{
1679	/* we are within the text window, so we	1680	/* we are within the text window, so we
1680	* shouldn't be scrolling	1681	* shouldn't be scrolling
…		…
1834	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1835	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835	}	1836	}
1836	#endif	1837	#endif
1837	}	1838	}
1838		1839
1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1840	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1840	void ecb_hot	1841	void ecb_hot
1841	rxvt_term::rootwin_cb (XEvent &ev)	1842	rxvt_term::rootwin_cb (XEvent &ev)
1842	{	1843	{
1843	make_current ();	1844	make_current ();
1844		1845
1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1846	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1847	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847	return;	1848	return;
1848		1849
1849	# if ENABLE_TRANSPARENCY
1850	switch (ev.type)	1850	switch (ev.type)
1851	{	1851	{
1852	case PropertyNotify:	1852	case PropertyNotify:
1853	/*	1853	/*
1854	* if user used some Esetroot compatible prog to set the root bg,	1854	* if user used some Esetroot compatible prog to set the root bg,
1855	* use the property to determine the pixmap. We use it later on.	1855	* use the property to determine the pixmap. We use it later on.
1856	*/	1856	*/
1857	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1857	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1858	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1859	{	1859	{
1860	bg_set_root_pixmap ();	1860	#if BG_IMAGE_FROM_ROOT
		1861	if (option (Opt_transparent))
		1862	{
		1863	rxvt_img::new_from_root (this)->replace (root_img);
1861	update_background ();	1864	update_background ();
		1865	}
		1866	#endif
		1867	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1862	}	1868	}
1863		1869
1864	break;	1870	break;
1865	}	1871	}
1866	# endif
1867		1872
1868	refresh_check ();	1873	refresh_check ();
1869	}	1874	}
1870	#endif	1875	#endif
1871		1876
…		…
2192		2197
2193	#ifdef MOUSE_WHEEL	2198	#ifdef MOUSE_WHEEL
2194	case Button4:	2199	case Button4:
2195	case Button5:	2200	case Button5:
2196	{	2201	{
2197	int i;	2202	int lines;
2198	page_dirn v;	2203	page_dirn dirn;
2199		2204
2200	v = ev.button == Button4 ? UP : DN;	2205	dirn = ev.button == Button4 ? UP : DN;
2201		2206
2202	if (ev.state & ShiftMask)	2207	if (ev.state & ShiftMask)
2203	i = 1;	2208	lines = 1;
2204	else if (option (Opt_mouseWheelScrollPage))	2209	else if (option (Opt_mouseWheelScrollPage))
2205	i = nrow - 1;	2210	lines = nrow - 1;
2206	else	2211	else
2207	i = 5;	2212	lines = 5;
2208		2213
2209	# ifdef MOUSE_SLIP_WHEELING	2214	# ifdef MOUSE_SLIP_WHEELING
2210	if (ev.state & ControlMask)	2215	if (ev.state & ControlMask)
2211	{	2216	{
2212	mouse_slip_wheel_speed += v ? -1 : 1;	2217	mouse_slip_wheel_speed += dirn;
2213	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2218	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2214	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215		2219
2216	if (!slip_wheel_ev.is_active ())	2220	if (!slip_wheel_ev.is_active ())
2217	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2221	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218	}	2222	}
2219	else	2223	else
2220	# endif	2224	# endif
2221	{	2225	{
2222	scr_page (v, i);	2226	scr_page (dirn, lines);
2223	scrollBar.show (1);	2227	scrollBar.show (1);
2224	}	2228	}
2225	}	2229	}
2226	break;	2230	break;
2227	#endif	2231	#endif
…		…
2380	}	2384	}
2381		2385
2382	if (len == (size_t)-1)	2386	if (len == (size_t)-1)
2383	{	2387	{
2384	mbstate.reset (); // reset now undefined conversion state	2388	mbstate.reset (); // reset now undefined conversion state
		2389	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2390	// in which case we "erroneously" return the next byte which might be valid.
2385	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2391	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386	}	2392	}
2387		2393
2388	// assume wchar == unicode	2394	// assume wchar == unicode
2389	cmdbuf_ptr += len;	2395	cmdbuf_ptr += len;
…		…
2794	};	2800	};
2795		2801
2796	void ecb_hot	2802	void ecb_hot
2797	rxvt_term::process_csi_seq ()	2803	rxvt_term::process_csi_seq ()
2798	{	2804	{
2799	unicode_t ch, priv, i;	2805	unicode_t ch, priv, prev_ch, i;
2800	unsigned int nargs, p;	2806	unsigned int nargs, p;
2801	int n, ndef;	2807	int n, ndef;
2802	int arg[ESC_ARGS] = { };	2808	int arg[ESC_ARGS] = { };
2803		2809
2804	nargs = 0;	2810	nargs = 0;
…		…
2810	/* '<' '=' '>' '?' '!' */	2816	/* '<' '=' '>' '?' '!' */
2811	priv = ch;	2817	priv = ch;
2812	ch = cmd_getc ();	2818	ch = cmd_getc ();
2813	}	2819	}
2814		2820
		2821	prev_ch = 0;
2815	/* read any numerical arguments */	2822	/* read any numerical arguments */
2816	for (n = -1; ch < CSI_ICH; )	2823	for (n = -1; ch < CSI_ICH; )
2817	{	2824	{
2818	if (isdigit (ch))	2825	if (isdigit (ch))
2819	{	2826	{
…		…
2829	n = -1;	2836	n = -1;
2830	}	2837	}
2831	else if (IS_CONTROL (ch))	2838	else if (IS_CONTROL (ch))
2832	process_nonprinting (ch);	2839	process_nonprinting (ch);
2833		2840
		2841	prev_ch = ch;
2834	ch = cmd_getc ();	2842	ch = cmd_getc ();
2835	}	2843	}
2836		2844
2837	if (ch > CSI_7F)	2845	if (ch > CSI_7F)
2838	return;	2846	return;
…		…
3072	scr_insert_mode (1);	3080	scr_insert_mode (1);
3073	else if (arg[0] == 20)	3081	else if (arg[0] == 20)
3074	priv_modes \|= PrivMode_LFNL;	3082	priv_modes \|= PrivMode_LFNL;
3075	break;	3083	break;
3076		3084
		3085	case CSI_71: // DESCUSR: set cursor style
		3086	if (prev_ch == ' ')
		3087	set_cursor_style (arg[0]);
		3088	break;
		3089
3077	/*	3090	/*
3078	* PRIVATE USE beyond this point. All CSI_7? sequences here	3091	* PRIVATE USE beyond this point. All CSI_7? sequences here
3079	*/	3092	*/
3080	case CSI_72: /* DECSTBM: set top and bottom margins */	3093	case CSI_72: /* DECSTBM: set top and bottom margins */
3081	if (nargs == 1)	3094	if (nargs == 1)
…		…
3214	rxvt_term::get_to_st (unicode_t &ends_how)	3227	rxvt_term::get_to_st (unicode_t &ends_how)
3215	{	3228	{
3216	unicode_t ch;	3229	unicode_t ch;
3217	bool seen_esc = false;	3230	bool seen_esc = false;
3218	unsigned int n = 0;	3231	unsigned int n = 0;
3219	wchar_t string[STRING_MAX];	3232	wchar_t string[CBUFSIZ];
3220		3233
3221	while ((ch = cmd_getc ()) != NOCHAR)	3234	while ((ch = cmd_getc ()) != NOCHAR)
3222	{	3235	{
3223	if (seen_esc)	3236	if (seen_esc)
3224	{	3237	{
…		…
3239	else if (ch < 0x20)	3252	else if (ch < 0x20)
3240	return NULL; /* other control character - exit */	3253	return NULL; /* other control character - exit */
3241		3254
3242	seen_esc = false;	3255	seen_esc = false;
3243		3256
3244	if (n >= STRING_MAX - 1)	3257	if (n >= sizeof (string) - 1)
3245	// stop at some sane length	3258	// stop at some sane length
3246	return NULL;	3259	return NULL;
3247		3260
3248	string[n++] = ch;	3261	string[n++] = ch;
3249	}	3262	}
…		…
3444	break;	3457	break;
3445	#endif	3458	#endif
3446	case URxvt_Color_border:	3459	case URxvt_Color_border:
3447	process_color_seq (op, Color_border, str, resp);	3460	process_color_seq (op, Color_border, str, resp);
3448	break;	3461	break;
3449	#if ENABLE_TRANSPARENCY	3462
		3463	#if BG_IMAGE_FROM_ROOT
3450	case URxvt_Color_tint:	3464	case URxvt_Color_tint:
3451	process_color_seq (op, Color_tint, str, resp);	3465	process_color_seq (op, Color_tint, str, resp);
3452	{	3466	{
3453	bool changed = false;	3467	bool changed = false;
3454		3468
…		…
3465	#if BG_IMAGE_FROM_FILE	3479	#if BG_IMAGE_FROM_FILE
3466	case Rxvt_Pixmap:	3480	case Rxvt_Pixmap:
3467	if (!strcmp (str, "?"))	3481	if (!strcmp (str, "?"))
3468	{	3482	{
3469	char str[256];	3483	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;	3484	int h_scale = fimage.h_scale;
3475	v_scale = image_vec[0].v_scale;	3485	int v_scale = fimage.v_scale;
3476	h_align = image_vec[0].h_align;	3486	int h_align = fimage.h_align;
3477	v_align = image_vec[0].v_align;	3487	int v_align = fimage.v_align;
3478	}
3479		3488
3480	sprintf (str, "[%dx%d+%d+%d]",	3489	sprintf (str, "[%dx%d+%d+%d]",
3481	h_scale, v_scale,	3490	h_scale, v_scale,
3482	h_align, v_align);	3491	h_align, v_align);
3483	process_xterm_seq (XTerm_title, str, CHAR_ST);	3492	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3486	{	3495	{
3487	bool changed = false;	3496	bool changed = false;
3488		3497
3489	if (*str != ';')	3498	if (*str != ';')
3490	{	3499	{
3491	if (image_vec.size () > 0)
3492	changed = image_vec[0].set_file_geometry (str);
3493	else	3500	try
3494	{	3501	{
3495	rxvt_image *image = new_image ();
3496	if (!image->set_file_geometry (str))	3502	fimage.set_file_geometry (this, str);
3497	image_vec.pop_back ();
3498	else
3499	changed = true;	3503	changed = true;
		3504	}
		3505	catch (const class rxvt_failure_exception &e)
		3506	{
3500	}	3507	}
3501	}	3508	}
3502	else	3509	else
3503	{	3510	{
3504	str++;	3511	str++;
3505	if (image_vec.size () > 0)
3506	changed = image_vec[0].set_geometry (str, true);	3512	if (fimage.set_geometry (str, true))
		3513	changed = true;
3507	}	3514	}
3508		3515
3509	if (changed)	3516	if (changed)
3510	{	3517	{
3511	if (bg_window_position_sensitive ())	3518	if (bg_window_position_sensitive ())
3512	{	3519	{
3513	int x, y;	3520	int x, y;
3514	get_window_origin (x, y);	3521	get_window_origin (x, y);
3515	bg_set_position (x, y);	3522	parent_x = x;
		3523	parent_y = y;
3516	}	3524	}
3517	update_background ();	3525	update_background ();
3518	}	3526	}
3519	}	3527	}
3520	break;	3528	break;
…		…
3991	break;	3999	break;
3992	#endif	4000	#endif
3993	}	4001	}
3994	}	4002	}
3995	}	4003	}
		4004
		4005	void
		4006	rxvt_term::set_cursor_style (int style)
		4007	{
		4008	if (!IN_RANGE_INC (style, 0, 4))
		4009	return;
		4010
		4011	set_option (Opt_cursorUnderline, style >= 3);
		4012
		4013	#ifdef CURSOR_BLINK
		4014	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4015	cursor_blink_reset ();
		4016	#endif
		4017
		4018	want_refresh = 1;
		4019	}
3996	/}}} /	4020	/}}} /
3997		4021
3998	/* ------------------------------------------------------------------------- */	4022	/* ------------------------------------------------------------------------- */
3999		4023
4000	/*	4024	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs. Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC