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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 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-2014 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
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)
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
		405	static inline wchar_t *
		406	rxvt_wcsdup (const wchar_t *str, int len)
		407	{
		408	wchar_t r = (wchar_t )rxvt_malloc ((len + 1) * sizeof (wchar_t));
		409	memcpy (r, str, len * sizeof (wchar_t));
		410	r[len] = 0;
		411	return r;
		412	}
		413
401	void ecb_cold	414	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	415	rxvt_term::key_press (XKeyEvent &ev)
403	{	416	{
404	int ctrl, meta, shft, len;	417	int ctrl, meta, shft, len;
405	KeySym keysym;	418	KeySym keysym;
…		…
506	#endif	519	#endif
507	max_it (lnsppg, 1);	520	max_it (lnsppg, 1);
508		521
509	if (keysym == XK_Prior)	522	if (keysym == XK_Prior)
510	{	523	{
511	scr_page (UP, lnsppg);	524	scr_page (lnsppg);
512	return;	525	return;
513	}	526	}
514	else if (keysym == XK_Next)	527	else if (keysym == XK_Next)
515	{	528	{
516	scr_page (DN, lnsppg);	529	scr_page (-lnsppg);
517	return;	530	return;
518	}	531	}
519	}	532	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	533	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	534	if (IS_SCROLL_MOD)
522	{	535	{
523	if (keysym == XK_Up)	536	if (keysym == XK_Up)
524	{	537	{
525	scr_page (UP, 1);	538	scr_page (1);
526	return;	539	return;
527	}	540	}
528	else if (keysym == XK_Down)	541	else if (keysym == XK_Down)
529	{	542	{
530	scr_page (DN, 1);	543	scr_page (-1);
531	return;	544	return;
532	}	545	}
533	}	546	}
534	#endif	547	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	548	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	549	if (IS_SCROLL_MOD)
537	{	550	{
538	if (keysym == XK_Home)	551	if (keysym == XK_Home)
539	{	552	{
540	scr_move_to (0, 1);	553	scr_changeview (top_row);
541	return;	554	return;
542	}	555	}
543	else if (keysym == XK_End)	556	else if (keysym == XK_End)
544	{	557	{
545	scr_move_to (1, 1);	558	scr_changeview (0);
546	return;	559	return;
547	}	560	}
548	}	561	}
549	#endif	562	#endif
550	}	563	}
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	585	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	586	return;
574	#endif	587	#endif
575	}	588	}
576	}	589	}
		590	}
		591
		592	if (ctrl && meta && (keysym == XK_c \|\| keysym == XK_v))
		593	{
		594	if (keysym == XK_v)
		595	selection_request (ev.time, Sel_Clipboard);
		596	else if (selection.len > 0)
		597	{
		598	free (selection.clip_text);
		599	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		600	selection.clip_len = selection.len;
		601	selection_grab (CurrentTime, true);
		602	}
		603
		604	return;
577	}	605	}
578		606
579	#if ENABLE_FRILLS \|\| ISO_14755	607	#if ENABLE_FRILLS \|\| ISO_14755
580	// ISO 14755 support	608	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))	609	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
…		…
937	void	965	void
938	rxvt_term::flush ()	966	rxvt_term::flush ()
939	{	967	{
940	flush_ev.stop ();	968	flush_ev.stop ();
941		969
942	#ifdef HAVE_BG_PIXMAP	970	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	971	if (bg_flags & BG_NEEDS_REFRESH)
944	{	972	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	973	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	974	scr_touch (false);
947	}	975	}
…		…
1073		1101
1074	#ifdef SELECTION_SCROLLING	1102	#ifdef SELECTION_SCROLLING
1075	void	1103	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1104	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1105	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1106	if (scr_page (scroll_selection_lines))
1079	{	1107	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1108	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1109	want_refresh = 1;
1082	refresh_check ();	1110	refresh_check ();
1083	}	1111	}
…		…
1088		1116
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1117	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1118	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1119	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1120	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1121	if (scr_page (mouse_slip_wheel_speed))
1094	{	1122	{
1095	want_refresh = 1;	1123	want_refresh = 1;
1096	refresh_check ();	1124	refresh_check ();
1097	}	1125	}
1098		1126
…		…
1461	if (ev.xconfigure.window == parent)	1489	if (ev.xconfigure.window == parent)
1462	{	1490	{
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1492	;
1465		1493
		1494	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1495
		1496	bool moved = false;
1466	#ifdef HAVE_BG_PIXMAP	1497	#ifdef HAVE_BG_PIXMAP
1467	bool moved = false;
1468	if (bg_window_position_sensitive ())	1498	if (bg_window_position_sensitive ())
1469	{	1499	{
		1500	want_position_change = true;
		1501	if (bg_img == 0)
		1502	moved = true;
		1503	}
		1504	#endif
		1505
		1506	if (want_position_change)
		1507	{
1470	int x, y;	1508	int x, y;
		1509
1471	if (ev.xconfigure.send_event)	1510	if (ev.xconfigure.send_event)
1472	{	1511	{
1473	x = ev.xconfigure.x;	1512	x = ev.xconfigure.x;
1474	y = ev.xconfigure.y;	1513	y = ev.xconfigure.y;
1475	}	1514	}
1476	else	1515	else
1477	get_window_origin (x, y);	1516	get_window_origin (x, y);
1478		1517
1479	if (bg_set_position (x, y)	1518	if (x != parent_x \|\| y != parent_y)
1480	\|\| !(bg_flags & BG_IS_VALID))	1519	{
		1520	parent_x = x;
		1521	parent_y = y;
		1522	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481	moved = true;	1523	moved = true;
		1524	}
1482	}	1525	}
1483	#endif
1484		1526
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1527	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1528	{
1487	seen_resize = 1;	1529	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1511	selection_send (ev.xselectionrequest);	1553	selection_send (ev.xselectionrequest);
1512	break;	1554	break;
1513		1555
1514	case MapNotify:	1556	case MapNotify:
1515	#ifdef HAVE_BG_PIXMAP	1557	#ifdef HAVE_BG_PIXMAP
1516	/* This is needed specifically to fix the case of no window manager or a	1558	// This is needed at startup for the case of no window manager
1517	* non-reparenting window manager. In those cases we never get first	1559	// or a non-reparenting window manager and also because we
1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1560	// defer bg image updates if the window is not mapped. The
1519	* care of multiplicity of ConfigureNotify events arriving while WM does	1561	// short delay is to optimize for multiple ConfigureNotify
1520	* reparenting.	1562	// events at startup when the window manager reparents the
1521	* We should not render background immediately, as there could be several	1563	// 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	1564	// received all of them.
1523	* by scheduling background redraw as soon as we can, but giving a short	1565	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);	1566	update_background_ev.start (0.025);
1530	#endif	1567	#endif
1531	mapped = 1;	1568	mapped = 1;
1532	#ifdef TEXT_BLINK	1569	#ifdef TEXT_BLINK
1533	text_blink_ev.start ();	1570	text_blink_ev.start ();
…		…
1625		1662
1626	#ifdef SELECTION_SCROLLING	1663	#ifdef SELECTION_SCROLLING
1627	if (ev.xbutton.y < int_bwidth	1664	if (ev.xbutton.y < int_bwidth
1628	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1665	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1629	{	1666	{
		1667	page_dirn scroll_selection_dir;
1630	int dist;	1668	int dist;
1631		1669
1632	/* don't clobber the current delay if we are	1670	/* don't clobber the current delay if we are
1633	* already in the middle of scrolling.	1671	* already in the middle of scrolling.
1634	*/	1672	*/
…		…
1657	scroll_selection_lines = Pixel2Height (dist)	1695	scroll_selection_lines = Pixel2Height (dist)
1658	/ SELECTION_SCROLL_LINE_SPEEDUP	1696	/ SELECTION_SCROLL_LINE_SPEEDUP
1659	+ 1;	1697	+ 1;
1660	min_it (scroll_selection_lines,	1698	min_it (scroll_selection_lines,
1661	SELECTION_SCROLL_MAX_LINES);	1699	SELECTION_SCROLL_MAX_LINES);
		1700	scroll_selection_lines *= scroll_selection_dir;
1662	}	1701	}
1663	else	1702	else
1664	{	1703	{
1665	/* we are within the text window, so we	1704	/* we are within the text window, so we
1666	* shouldn't be scrolling	1705	* shouldn't be scrolling
…		…
1820	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1859	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821	}	1860	}
1822	#endif	1861	#endif
1823	}	1862	}
1824		1863
1825	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1864	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1826	void ecb_hot	1865	void ecb_hot
1827	rxvt_term::rootwin_cb (XEvent &ev)	1866	rxvt_term::rootwin_cb (XEvent &ev)
1828	{	1867	{
1829	make_current ();	1868	make_current ();
1830		1869
1831	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1870	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1871	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833	return;	1872	return;
1834		1873
1835	# if ENABLE_TRANSPARENCY
1836	switch (ev.type)	1874	switch (ev.type)
1837	{	1875	{
1838	case PropertyNotify:	1876	case PropertyNotify:
1839	/*	1877	/*
1840	* if user used some Esetroot compatible prog to set the root bg,	1878	* 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.	1879	* use the property to determine the pixmap. We use it later on.
1842	*/	1880	*/
1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1881	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1882	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	{	1883	{
1846	bg_set_root_pixmap ();	1884	#if BG_IMAGE_FROM_ROOT
		1885	if (option (Opt_transparent))
		1886	{
		1887	rxvt_img::new_from_root (this)->replace (root_img);
1847	update_background ();	1888	update_background ();
		1889	}
		1890	#endif
		1891	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848	}	1892	}
1849		1893
1850	break;	1894	break;
1851	}	1895	}
1852	# endif
1853		1896
1854	refresh_check ();	1897	refresh_check ();
1855	}	1898	}
1856	#endif	1899	#endif
1857		1900
…		…
2178		2221
2179	#ifdef MOUSE_WHEEL	2222	#ifdef MOUSE_WHEEL
2180	case Button4:	2223	case Button4:
2181	case Button5:	2224	case Button5:
2182	{	2225	{
2183	int i;	2226	int lines;
2184	page_dirn v;	2227	page_dirn dirn;
2185		2228
2186	v = ev.button == Button4 ? UP : DN;	2229	dirn = ev.button == Button4 ? UP : DN;
2187		2230
2188	if (ev.state & ShiftMask)	2231	if (ev.state & ShiftMask)
2189	i = 1;	2232	lines = 1;
2190	else if (option (Opt_mouseWheelScrollPage))	2233	else if (option (Opt_mouseWheelScrollPage))
2191	i = nrow - 1;	2234	lines = nrow - 1;
2192	else	2235	else
2193	i = 5;	2236	lines = 5;
2194		2237
2195	# ifdef MOUSE_SLIP_WHEELING	2238	# ifdef MOUSE_SLIP_WHEELING
2196	if (ev.state & ControlMask)	2239	if (ev.state & ControlMask)
2197	{	2240	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2241	mouse_slip_wheel_speed += dirn;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2242	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2243
2202	if (!slip_wheel_ev.is_active ())	2244	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2245	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204	}	2246	}
2205	else	2247	else
2206	# endif	2248	# endif
2207	{	2249	{
2208	scr_page (v, i);	2250	scr_page (dirn, lines);
2209	scrollBar.show (1);	2251	scrollBar.show (1);
2210	}	2252	}
2211	}	2253	}
2212	break;	2254	break;
2213	#endif	2255	#endif
…		…
2366	}	2408	}
2367		2409
2368	if (len == (size_t)-1)	2410	if (len == (size_t)-1)
2369	{	2411	{
2370	mbstate.reset (); // reset now undefined conversion state	2412	mbstate.reset (); // reset now undefined conversion state
		2413	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2414	// 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	2415	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372	}	2416	}
2373		2417
2374	// assume wchar == unicode	2418	// assume wchar == unicode
2375	cmdbuf_ptr += len;	2419	cmdbuf_ptr += len;
…		…
2780	};	2824	};
2781		2825
2782	void ecb_hot	2826	void ecb_hot
2783	rxvt_term::process_csi_seq ()	2827	rxvt_term::process_csi_seq ()
2784	{	2828	{
2785	unicode_t ch, priv, i;	2829	unicode_t ch, priv, prev_ch, i;
2786	unsigned int nargs, p;	2830	unsigned int nargs, p;
2787	int n, ndef;	2831	int n, ndef;
2788	int arg[ESC_ARGS] = { };	2832	int arg[ESC_ARGS] = { };
2789		2833
2790	nargs = 0;	2834	nargs = 0;
…		…
2796	/* '<' '=' '>' '?' '!' */	2840	/* '<' '=' '>' '?' '!' */
2797	priv = ch;	2841	priv = ch;
2798	ch = cmd_getc ();	2842	ch = cmd_getc ();
2799	}	2843	}
2800		2844
		2845	prev_ch = 0;
2801	/* read any numerical arguments */	2846	/* read any numerical arguments */
2802	for (n = -1; ch < CSI_ICH; )	2847	for (n = -1; ch < CSI_ICH; )
2803	{	2848	{
2804	if (isdigit (ch))	2849	if (isdigit (ch))
2805	{	2850	{
…		…
2815	n = -1;	2860	n = -1;
2816	}	2861	}
2817	else if (IS_CONTROL (ch))	2862	else if (IS_CONTROL (ch))
2818	process_nonprinting (ch);	2863	process_nonprinting (ch);
2819		2864
		2865	prev_ch = ch;
2820	ch = cmd_getc ();	2866	ch = cmd_getc ();
2821	}	2867	}
2822		2868
2823	if (ch > CSI_7F)	2869	if (ch > CSI_7F)
2824	return;	2870	return;
…		…
3058	scr_insert_mode (1);	3104	scr_insert_mode (1);
3059	else if (arg[0] == 20)	3105	else if (arg[0] == 20)
3060	priv_modes \|= PrivMode_LFNL;	3106	priv_modes \|= PrivMode_LFNL;
3061	break;	3107	break;
3062		3108
		3109	case CSI_71: // DESCUSR: set cursor style
		3110	if (prev_ch == ' ')
		3111	set_cursor_style (arg[0]);
		3112	break;
		3113
3063	/*	3114	/*
3064	* PRIVATE USE beyond this point. All CSI_7? sequences here	3115	* PRIVATE USE beyond this point. All CSI_7? sequences here
3065	*/	3116	*/
3066	case CSI_72: /* DECSTBM: set top and bottom margins */	3117	case CSI_72: /* DECSTBM: set top and bottom margins */
3067	if (nargs == 1)	3118	if (nargs == 1)
…		…
3200	rxvt_term::get_to_st (unicode_t &ends_how)	3251	rxvt_term::get_to_st (unicode_t &ends_how)
3201	{	3252	{
3202	unicode_t ch;	3253	unicode_t ch;
3203	bool seen_esc = false;	3254	bool seen_esc = false;
3204	unsigned int n = 0;	3255	unsigned int n = 0;
3205	wchar_t string[STRING_MAX];	3256	wchar_t string[CBUFSIZ];
3206		3257
3207	while ((ch = cmd_getc ()) != NOCHAR)	3258	while ((ch = cmd_getc ()) != NOCHAR)
3208	{	3259	{
3209	if (seen_esc)	3260	if (seen_esc)
3210	{	3261	{
…		…
3225	else if (ch < 0x20)	3276	else if (ch < 0x20)
3226	return NULL; /* other control character - exit */	3277	return NULL; /* other control character - exit */
3227		3278
3228	seen_esc = false;	3279	seen_esc = false;
3229		3280
3230	if (n >= STRING_MAX - 1)	3281	if (n >= sizeof (string) - 1)
3231	// stop at some sane length	3282	// stop at some sane length
3232	return NULL;	3283	return NULL;
3233		3284
3234	string[n++] = ch;	3285	string[n++] = ch;
3235	}	3286	}
…		…
3352	&nitems, &bytes_after, &value) == Success	3403	&nitems, &bytes_after, &value) == Success
3353	&& actual_type != None	3404	&& actual_type != None
3354	&& actual_format == 8)	3405	&& actual_format == 8)
3355	str = (const char *)(value);	3406	str = (const char *)(value);
3356		3407
3357	tt_printf ("\033]%d;%s%c", op, str, resp);	3408	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358		3409
3359	XFree (value);	3410	XFree (value);
3360	}	3411	}
3361	else	3412	else
3362	{	3413	{
…		…
3430	break;	3481	break;
3431	#endif	3482	#endif
3432	case URxvt_Color_border:	3483	case URxvt_Color_border:
3433	process_color_seq (op, Color_border, str, resp);	3484	process_color_seq (op, Color_border, str, resp);
3434	break;	3485	break;
3435	#if ENABLE_TRANSPARENCY	3486
		3487	#if BG_IMAGE_FROM_ROOT
3436	case URxvt_Color_tint:	3488	case URxvt_Color_tint:
3437	process_color_seq (op, Color_tint, str, resp);	3489	process_color_seq (op, Color_tint, str, resp);
3438	{	3490	{
3439	bool changed = false;	3491	bool changed = false;
3440		3492
…		…
3451	#if BG_IMAGE_FROM_FILE	3503	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3504	case Rxvt_Pixmap:
3453	if (!strcmp (str, "?"))	3505	if (!strcmp (str, "?"))
3454	{	3506	{
3455	char str[256];	3507	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;	3508	int h_scale = fimage.h_scale;
3461	v_scale = image_vec[0].v_scale;	3509	int v_scale = fimage.v_scale;
3462	h_align = image_vec[0].h_align;	3510	int h_align = fimage.h_align;
3463	v_align = image_vec[0].v_align;	3511	int v_align = fimage.v_align;
3464	}
3465		3512
3466	sprintf (str, "[%dx%d+%d+%d]",	3513	sprintf (str, "[%dx%d+%d+%d]",
3467	h_scale, v_scale,	3514	h_scale, v_scale,
3468	h_align, v_align);	3515	h_align, v_align);
3469	process_xterm_seq (XTerm_title, str, CHAR_ST);	3516	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3472	{	3519	{
3473	bool changed = false;	3520	bool changed = false;
3474		3521
3475	if (*str != ';')	3522	if (*str != ';')
3476	{	3523	{
3477	if (image_vec.size () > 0)
3478	changed = image_vec[0].set_file_geometry (str);
3479	else	3524	try
3480	{	3525	{
3481	rxvt_image *image = new_image ();
3482	if (!image->set_file_geometry (str))	3526	fimage.set_file_geometry (this, str);
3483	image_vec.pop_back ();
3484	else
3485	changed = true;	3527	changed = true;
		3528	}
		3529	catch (const class rxvt_failure_exception &e)
		3530	{
3486	}	3531	}
3487	}	3532	}
3488	else	3533	else
3489	{	3534	{
3490	str++;	3535	str++;
3491	if (image_vec.size () > 0)
3492	changed = image_vec[0].set_geometry (str, true);	3536	if (fimage.set_geometry (str, true))
		3537	changed = true;
3493	}	3538	}
3494		3539
3495	if (changed)	3540	if (changed)
3496	{	3541	{
3497	if (bg_window_position_sensitive ())	3542	if (bg_window_position_sensitive ())
3498	{	3543	{
3499	int x, y;	3544	int x, y;
3500	get_window_origin (x, y);	3545	get_window_origin (x, y);
3501	bg_set_position (x, y);	3546	parent_x = x;
		3547	parent_y = y;
3502	}	3548	}
3503	update_background ();	3549	update_background ();
3504	}	3550	}
3505	}	3551	}
3506	break;	3552	break;
…		…
3977	break;	4023	break;
3978	#endif	4024	#endif
3979	}	4025	}
3980	}	4026	}
3981	}	4027	}
		4028
		4029	void
		4030	rxvt_term::set_cursor_style (int style)
		4031	{
		4032	if (!IN_RANGE_INC (style, 0, 4))
		4033	return;
		4034
		4035	set_option (Opt_cursorUnderline, style >= 3);
		4036
		4037	#ifdef CURSOR_BLINK
		4038	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4039	cursor_blink_reset ();
		4040	#endif
		4041
		4042	want_refresh = 1;
		4043	}
3982	/}}} /	4044	/}}} /
3983		4045
3984	/* ------------------------------------------------------------------------- */	4046	/* ------------------------------------------------------------------------- */
3985		4047
3986	/*	4048	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC vs. Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC