[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.544 by sf-exg, Sat Apr 26 14:55:58 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;
406	int valid_keysym;	419	int valid_keysym;
407	char kbuf[KBUFSZ];	420	char rkbuf[KBUFSZ];
		421	char *kbuf = rkbuf + 1;
408		422
409	#if ISO_14755	423	#if ISO_14755
410	if (iso14755buf & ISO_14755_52)	424	if (iso14755buf & ISO_14755_52)
411	return;	425	return;
412	#endif	426	#endif
…		…
506	#endif	520	#endif
507	max_it (lnsppg, 1);	521	max_it (lnsppg, 1);
508		522
509	if (keysym == XK_Prior)	523	if (keysym == XK_Prior)
510	{	524	{
511	scr_page (UP, lnsppg);	525	scr_page (lnsppg);
512	return;	526	return;
513	}	527	}
514	else if (keysym == XK_Next)	528	else if (keysym == XK_Next)
515	{	529	{
516	scr_page (DN, lnsppg);	530	scr_page (-lnsppg);
517	return;	531	return;
518	}	532	}
519	}	533	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	534	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	535	if (IS_SCROLL_MOD)
522	{	536	{
523	if (keysym == XK_Up)	537	if (keysym == XK_Up)
524	{	538	{
525	scr_page (UP, 1);	539	scr_page (1);
526	return;	540	return;
527	}	541	}
528	else if (keysym == XK_Down)	542	else if (keysym == XK_Down)
529	{	543	{
530	scr_page (DN, 1);	544	scr_page (-1);
531	return;	545	return;
532	}	546	}
533	}	547	}
534	#endif	548	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	549	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	550	if (IS_SCROLL_MOD)
537	{	551	{
538	if (keysym == XK_Home)	552	if (keysym == XK_Home)
539	{	553	{
540	scr_move_to (0, 1);	554	scr_changeview (top_row);
541	return;	555	return;
542	}	556	}
543	else if (keysym == XK_End)	557	else if (keysym == XK_End)
544	{	558	{
545	scr_move_to (1, 1);	559	scr_changeview (0);
546	return;	560	return;
547	}	561	}
548	}	562	}
549	#endif	563	#endif
550	}	564	}
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	586	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	587	return;
574	#endif	588	#endif
575	}	589	}
576	}	590	}
		591	}
		592
		593	if (ctrl && meta && (keysym == XK_c \|\| keysym == XK_v))
		594	{
		595	if (keysym == XK_v)
		596	selection_request (ev.time, Sel_Clipboard);
		597	else if (selection.len > 0)
		598	{
		599	free (selection.clip_text);
		600	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		601	selection.clip_len = selection.len;
		602	selection_grab (CurrentTime, true);
		603	}
		604
		605	return;
577	}	606	}
578		607
579	#if ENABLE_FRILLS \|\| ISO_14755	608	#if ENABLE_FRILLS \|\| ISO_14755
580	// ISO 14755 support	609	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))	610	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
…		…
828	#endif	857	#endif
829	/* nil */ ;	858	/* nil */ ;
830	}	859	}
831	}	860	}
832		861
		862	/* escape prefix */
		863	if (len && meta
		864	#ifdef META8_OPTION
		865	&& meta_char == C0_ESC
		866	#endif
		867	)
		868	{
		869	*--kbuf = C0_ESC;
		870	len++;
		871	}
		872
833	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))	873	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834	return;	874	return;
835		875
836	if (len <= 0)	876	if (len <= 0)
837	return; /* not mapped */	877	return; /* not mapped */
…		…
840	if (view_start)	880	if (view_start)
841	{	881	{
842	view_start = 0;	882	view_start = 0;
843	want_refresh = 1;	883	want_refresh = 1;
844	}	884	}
845
846	/* escape prefix */
847	if (meta
848	#ifdef META8_OPTION
849	&& meta_char == C0_ESC
850	#endif
851	)
852	{
853	const char ch = C0_ESC;
854	tt_write (&ch, 1);
855	}
856		885
857	tt_write (kbuf, (unsigned int)len);	886	tt_write (kbuf, (unsigned int)len);
858	}	887	}
859		888
860	void ecb_cold	889	void ecb_cold
…		…
937	void	966	void
938	rxvt_term::flush ()	967	rxvt_term::flush ()
939	{	968	{
940	flush_ev.stop ();	969	flush_ev.stop ();
941		970
942	#ifdef HAVE_BG_PIXMAP	971	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	972	if (bg_flags & BG_NEEDS_REFRESH)
944	{	973	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	974	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	975	scr_touch (false);
947	}	976	}
…		…
1073		1102
1074	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1075	void	1104	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1106	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_lines))
1079	{	1108	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1110	want_refresh = 1;
1082	refresh_check ();	1111	refresh_check ();
1083	}	1112	}
…		…
1088		1117
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1119	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1121	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1122	if (scr_page (mouse_slip_wheel_speed))
1094	{	1123	{
1095	want_refresh = 1;	1124	want_refresh = 1;
1096	refresh_check ();	1125	refresh_check ();
1097	}	1126	}
1098		1127
…		…
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1492	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1493	;
1465		1494
1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);	1495	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467		1496
		1497	bool moved = false;
1468	#ifdef HAVE_BG_PIXMAP	1498	#ifdef HAVE_BG_PIXMAP
1469	if (bg_window_position_sensitive ())	1499	if (bg_window_position_sensitive ())
		1500	{
1470	want_position_change = true;	1501	want_position_change = true;
		1502	if (bg_img == 0)
		1503	moved = true;
		1504	}
1471	#endif	1505	#endif
1472
1473	bool moved = false;
1474		1506
1475	if (want_position_change)	1507	if (want_position_change)
1476	{	1508	{
1477	int x, y;	1509	int x, y;
1478		1510
…		…
1484	else	1516	else
1485	get_window_origin (x, y);	1517	get_window_origin (x, y);
1486		1518
1487	if (x != parent_x \|\| y != parent_y)	1519	if (x != parent_x \|\| y != parent_y)
1488	{	1520	{
1489	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490	parent_x = x;	1521	parent_x = x;
1491	parent_y = y;	1522	parent_y = y;
		1523	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1524	moved = true;
1492	}	1525	}
1493
1494	if (bg_set_position (x, y)
1495	\|\| !(bg_flags & BG_IS_VALID))
1496	moved = true;
1497	}	1526	}
1498		1527
1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1528	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1500	{	1529	{
1501	seen_resize = 1;	1530	seen_resize = 1;
…		…
1525	selection_send (ev.xselectionrequest);	1554	selection_send (ev.xselectionrequest);
1526	break;	1555	break;
1527		1556
1528	case MapNotify:	1557	case MapNotify:
1529	#ifdef HAVE_BG_PIXMAP	1558	#ifdef HAVE_BG_PIXMAP
1530	/* This is needed specifically to fix the case of no window manager or a	1559	// This is needed at startup for the case of no window manager
1531	* non-reparenting window manager. In those cases we never get first	1560	// or a non-reparenting window manager and also because we
1532	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1561	// defer bg image updates if the window is not mapped. The
1533	* care of multiplicity of ConfigureNotify events arriving while WM does	1562	// short delay is to optimize for multiple ConfigureNotify
1534	* reparenting.	1563	// events at startup when the window manager reparents the
1535	* We should not render background immediately, as there could be several	1564	// 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	1565	// received all of them.
1537	* by scheduling background redraw as soon as we can, but giving a short	1566	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);	1567	update_background_ev.start (0.025);
1544	#endif	1568	#endif
1545	mapped = 1;	1569	mapped = 1;
1546	#ifdef TEXT_BLINK	1570	#ifdef TEXT_BLINK
1547	text_blink_ev.start ();	1571	text_blink_ev.start ();
…		…
1639		1663
1640	#ifdef SELECTION_SCROLLING	1664	#ifdef SELECTION_SCROLLING
1641	if (ev.xbutton.y < int_bwidth	1665	if (ev.xbutton.y < int_bwidth
1642	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1666	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1643	{	1667	{
		1668	page_dirn scroll_selection_dir;
1644	int dist;	1669	int dist;
1645		1670
1646	/* don't clobber the current delay if we are	1671	/* don't clobber the current delay if we are
1647	* already in the middle of scrolling.	1672	* already in the middle of scrolling.
1648	*/	1673	*/
…		…
1671	scroll_selection_lines = Pixel2Height (dist)	1696	scroll_selection_lines = Pixel2Height (dist)
1672	/ SELECTION_SCROLL_LINE_SPEEDUP	1697	/ SELECTION_SCROLL_LINE_SPEEDUP
1673	+ 1;	1698	+ 1;
1674	min_it (scroll_selection_lines,	1699	min_it (scroll_selection_lines,
1675	SELECTION_SCROLL_MAX_LINES);	1700	SELECTION_SCROLL_MAX_LINES);
		1701	scroll_selection_lines *= scroll_selection_dir;
1676	}	1702	}
1677	else	1703	else
1678	{	1704	{
1679	/* we are within the text window, so we	1705	/* we are within the text window, so we
1680	* shouldn't be scrolling	1706	* shouldn't be scrolling
…		…
1834	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1860	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835	}	1861	}
1836	#endif	1862	#endif
1837	}	1863	}
1838		1864
1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1865	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1840	void ecb_hot	1866	void ecb_hot
1841	rxvt_term::rootwin_cb (XEvent &ev)	1867	rxvt_term::rootwin_cb (XEvent &ev)
1842	{	1868	{
1843	make_current ();	1869	make_current ();
1844		1870
…		…
1854	* use the property to determine the pixmap. We use it later on.	1880	* use the property to determine the pixmap. We use it later on.
1855	*/	1881	*/
1856	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1882	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1857	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1883	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1858	{	1884	{
1859	# if ENABLE_TRANSPARENCY	1885	#if BG_IMAGE_FROM_ROOT
1860	bg_set_root_pixmap ();	1886	if (option (Opt_transparent))
		1887	{
		1888	rxvt_img::new_from_root (this)->replace (root_img);
1861	update_background ();	1889	update_background ();
		1890	}
1862	#endif	1891	#endif
1863	#if ENABLE_PERL
1864	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));	1892	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865	#endif
1866	}	1893	}
1867		1894
1868	break;	1895	break;
1869	}	1896	}
1870		1897
…		…
2195		2222
2196	#ifdef MOUSE_WHEEL	2223	#ifdef MOUSE_WHEEL
2197	case Button4:	2224	case Button4:
2198	case Button5:	2225	case Button5:
2199	{	2226	{
2200	int i;	2227	int lines;
2201	page_dirn v;	2228	page_dirn dirn;
2202		2229
2203	v = ev.button == Button4 ? UP : DN;	2230	dirn = ev.button == Button4 ? UP : DN;
2204		2231
2205	if (ev.state & ShiftMask)	2232	if (ev.state & ShiftMask)
2206	i = 1;	2233	lines = 1;
2207	else if (option (Opt_mouseWheelScrollPage))	2234	else if (option (Opt_mouseWheelScrollPage))
2208	i = nrow - 1;	2235	lines = nrow - 1;
2209	else	2236	else
2210	i = 5;	2237	lines = 5;
2211		2238
2212	# ifdef MOUSE_SLIP_WHEELING	2239	# ifdef MOUSE_SLIP_WHEELING
2213	if (ev.state & ControlMask)	2240	if (ev.state & ControlMask)
2214	{	2241	{
2215	mouse_slip_wheel_speed += v ? -1 : 1;	2242	mouse_slip_wheel_speed += dirn;
2216	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2243	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218		2244
2219	if (!slip_wheel_ev.is_active ())	2245	if (!slip_wheel_ev.is_active ())
2220	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2246	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221	}	2247	}
2222	else	2248	else
2223	# endif	2249	# endif
2224	{	2250	{
2225	scr_page (v, i);	2251	scr_page (dirn, lines);
2226	scrollBar.show (1);	2252	scrollBar.show (1);
2227	}	2253	}
2228	}	2254	}
2229	break;	2255	break;
2230	#endif	2256	#endif
…		…
2383	}	2409	}
2384		2410
2385	if (len == (size_t)-1)	2411	if (len == (size_t)-1)
2386	{	2412	{
2387	mbstate.reset (); // reset now undefined conversion state	2413	mbstate.reset (); // reset now undefined conversion state
		2414	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2415	// 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	2416	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389	}	2417	}
2390		2418
2391	// assume wchar == unicode	2419	// assume wchar == unicode
2392	cmdbuf_ptr += len;	2420	cmdbuf_ptr += len;
…		…
2797	};	2825	};
2798		2826
2799	void ecb_hot	2827	void ecb_hot
2800	rxvt_term::process_csi_seq ()	2828	rxvt_term::process_csi_seq ()
2801	{	2829	{
2802	unicode_t ch, priv, i;	2830	unicode_t ch, priv, prev_ch, i;
2803	unsigned int nargs, p;	2831	unsigned int nargs, p;
2804	int n, ndef;	2832	int n, ndef;
2805	int arg[ESC_ARGS] = { };	2833	int arg[ESC_ARGS] = { };
2806		2834
2807	nargs = 0;	2835	nargs = 0;
…		…
2813	/* '<' '=' '>' '?' '!' */	2841	/* '<' '=' '>' '?' '!' */
2814	priv = ch;	2842	priv = ch;
2815	ch = cmd_getc ();	2843	ch = cmd_getc ();
2816	}	2844	}
2817		2845
		2846	prev_ch = 0;
2818	/* read any numerical arguments */	2847	/* read any numerical arguments */
2819	for (n = -1; ch < CSI_ICH; )	2848	for (n = -1; ch < CSI_ICH; )
2820	{	2849	{
2821	if (isdigit (ch))	2850	if (isdigit (ch))
2822	{	2851	{
…		…
2832	n = -1;	2861	n = -1;
2833	}	2862	}
2834	else if (IS_CONTROL (ch))	2863	else if (IS_CONTROL (ch))
2835	process_nonprinting (ch);	2864	process_nonprinting (ch);
2836		2865
		2866	prev_ch = ch;
2837	ch = cmd_getc ();	2867	ch = cmd_getc ();
2838	}	2868	}
2839		2869
2840	if (ch > CSI_7F)	2870	if (ch > CSI_7F)
2841	return;	2871	return;
…		…
3075	scr_insert_mode (1);	3105	scr_insert_mode (1);
3076	else if (arg[0] == 20)	3106	else if (arg[0] == 20)
3077	priv_modes \|= PrivMode_LFNL;	3107	priv_modes \|= PrivMode_LFNL;
3078	break;	3108	break;
3079		3109
		3110	case CSI_71: // DESCUSR: set cursor style
		3111	if (prev_ch == ' ')
		3112	set_cursor_style (arg[0]);
		3113	break;
		3114
3080	/*	3115	/*
3081	* PRIVATE USE beyond this point. All CSI_7? sequences here	3116	* PRIVATE USE beyond this point. All CSI_7? sequences here
3082	*/	3117	*/
3083	case CSI_72: /* DECSTBM: set top and bottom margins */	3118	case CSI_72: /* DECSTBM: set top and bottom margins */
3084	if (nargs == 1)	3119	if (nargs == 1)
…		…
3217	rxvt_term::get_to_st (unicode_t &ends_how)	3252	rxvt_term::get_to_st (unicode_t &ends_how)
3218	{	3253	{
3219	unicode_t ch;	3254	unicode_t ch;
3220	bool seen_esc = false;	3255	bool seen_esc = false;
3221	unsigned int n = 0;	3256	unsigned int n = 0;
3222	wchar_t string[STRING_MAX];	3257	wchar_t string[CBUFSIZ];
3223		3258
3224	while ((ch = cmd_getc ()) != NOCHAR)	3259	while ((ch = cmd_getc ()) != NOCHAR)
3225	{	3260	{
3226	if (seen_esc)	3261	if (seen_esc)
3227	{	3262	{
…		…
3242	else if (ch < 0x20)	3277	else if (ch < 0x20)
3243	return NULL; /* other control character - exit */	3278	return NULL; /* other control character - exit */
3244		3279
3245	seen_esc = false;	3280	seen_esc = false;
3246		3281
3247	if (n >= STRING_MAX - 1)	3282	if (n >= sizeof (string) - 1)
3248	// stop at some sane length	3283	// stop at some sane length
3249	return NULL;	3284	return NULL;
3250		3285
3251	string[n++] = ch;	3286	string[n++] = ch;
3252	}	3287	}
…		…
3369	&nitems, &bytes_after, &value) == Success	3404	&nitems, &bytes_after, &value) == Success
3370	&& actual_type != None	3405	&& actual_type != None
3371	&& actual_format == 8)	3406	&& actual_format == 8)
3372	str = (const char *)(value);	3407	str = (const char *)(value);
3373		3408
3374	tt_printf ("\033]%d;%s%c", op, str, resp);	3409	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3375		3410
3376	XFree (value);	3411	XFree (value);
3377	}	3412	}
3378	else	3413	else
3379	{	3414	{
…		…
3447	break;	3482	break;
3448	#endif	3483	#endif
3449	case URxvt_Color_border:	3484	case URxvt_Color_border:
3450	process_color_seq (op, Color_border, str, resp);	3485	process_color_seq (op, Color_border, str, resp);
3451	break;	3486	break;
3452	#if ENABLE_TRANSPARENCY	3487
		3488	#if BG_IMAGE_FROM_ROOT
3453	case URxvt_Color_tint:	3489	case URxvt_Color_tint:
3454	process_color_seq (op, Color_tint, str, resp);	3490	process_color_seq (op, Color_tint, str, resp);
3455	{	3491	{
3456	bool changed = false;	3492	bool changed = false;
3457		3493
…		…
3468	#if BG_IMAGE_FROM_FILE	3504	#if BG_IMAGE_FROM_FILE
3469	case Rxvt_Pixmap:	3505	case Rxvt_Pixmap:
3470	if (!strcmp (str, "?"))	3506	if (!strcmp (str, "?"))
3471	{	3507	{
3472	char str[256];	3508	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;	3509	int h_scale = fimage.h_scale;
3478	v_scale = image_vec[0].v_scale;	3510	int v_scale = fimage.v_scale;
3479	h_align = image_vec[0].h_align;	3511	int h_align = fimage.h_align;
3480	v_align = image_vec[0].v_align;	3512	int v_align = fimage.v_align;
3481	}
3482		3513
3483	sprintf (str, "[%dx%d+%d+%d]",	3514	sprintf (str, "[%dx%d+%d+%d]",
3484	h_scale, v_scale,	3515	h_scale, v_scale,
3485	h_align, v_align);	3516	h_align, v_align);
3486	process_xterm_seq (XTerm_title, str, CHAR_ST);	3517	process_xterm_seq (XTerm_title, str, CHAR_ST);
…		…
3489	{	3520	{
3490	bool changed = false;	3521	bool changed = false;
3491		3522
3492	if (*str != ';')	3523	if (*str != ';')
3493	{	3524	{
3494	if (image_vec.size () > 0)
3495	changed = image_vec[0].set_file_geometry (str);
3496	else	3525	try
3497	{	3526	{
3498	rxvt_image *image = new_image ();
3499	if (!image->set_file_geometry (str))	3527	fimage.set_file_geometry (this, str);
3500	image_vec.pop_back ();
3501	else
3502	changed = true;	3528	changed = true;
		3529	}
		3530	catch (const class rxvt_failure_exception &e)
		3531	{
3503	}	3532	}
3504	}	3533	}
3505	else	3534	else
3506	{	3535	{
3507	str++;	3536	str++;
3508	if (image_vec.size () > 0)
3509	changed = image_vec[0].set_geometry (str, true);	3537	if (fimage.set_geometry (str, true))
		3538	changed = true;
3510	}	3539	}
3511		3540
3512	if (changed)	3541	if (changed)
3513	{	3542	{
3514	if (bg_window_position_sensitive ())	3543	if (bg_window_position_sensitive ())
3515	{	3544	{
3516	int x, y;	3545	int x, y;
3517	get_window_origin (x, y);	3546	get_window_origin (x, y);
3518	bg_set_position (x, y);	3547	parent_x = x;
		3548	parent_y = y;
3519	}	3549	}
3520	update_background ();	3550	update_background ();
3521	}	3551	}
3522	}	3552	}
3523	break;	3553	break;
…		…
3994	break;	4024	break;
3995	#endif	4025	#endif
3996	}	4026	}
3997	}	4027	}
3998	}	4028	}
		4029
		4030	void
		4031	rxvt_term::set_cursor_style (int style)
		4032	{
		4033	if (!IN_RANGE_INC (style, 0, 4))
		4034	return;
		4035
		4036	set_option (Opt_cursorUnderline, style >= 3);
		4037
		4038	#ifdef CURSOR_BLINK
		4039	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4040	cursor_blink_reset ();
		4041	#endif
		4042
		4043	want_refresh = 1;
		4044	}
3999	/}}} /	4045	/}}} /
4000		4046
4001	/* ------------------------------------------------------------------------- */	4047	/* ------------------------------------------------------------------------- */
4002		4048
4003	/*	4049	/*

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.544 by sf-exg, Sat Apr 26 14:55:58 2014 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.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC