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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.527 by sf-exg, Sat Dec 29 14:23:35 2012 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>
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR \|\| !x)	152	if (t != NOCHAR \|\| !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];	206	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
403	{	407	{
404	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
405	KeySym keysym;	409	KeySym keysym;
406	int valid_keysym;	410	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
423		427
424	kbuf[0] = 0;	428	kbuf[0] = 0;
425		429
426	#ifdef USE_XIM	430	#if USE_XIM
427	if (Input_Context)	431	if (Input_Context)
428	{	432	{
429	Status status_return;	433	Status status_return;
430		434
431	#if 0	435	#if 0
…		…
776	}	780	}
777		781
778	if (newlen)	782	if (newlen)
779	len = strlen (kbuf);	783	len = strlen (kbuf);
780		784
		785	if (len > 0)
		786	{
781	/*	787	/*
		788	* pass Shift/Control indicators for function keys ending with `~'
		789	*
		790	* eg,
		791	* Prior = "ESC[5~"
		792	* Shift+Prior = "ESC[5$"
		793	* Ctrl+Prior = "ESC[5^"
		794	* Ctrl+Shift+Prior = "ESC[5@"
		795	*/
		796	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		797	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		798
		799	/*
782	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
783	*/	801	*/
784	#ifdef META8_OPTION	802	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
787	#endif	805	#endif
		806	}
788		807
789	}	808	}
790	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
791	{	810	{
792	len = 1;	811	len = 1;
…		…
826	{	845	{
827	view_start = 0;	846	view_start = 0;
828	want_refresh = 1;	847	want_refresh = 1;
829	}	848	}
830		849
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */	850	/* escape prefix */
846	if (meta	851	if (meta
847	#ifdef META8_OPTION	852	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
849	#endif	854	#endif
…		…
854	}	859	}
855		860
856	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
857	}	862	}
858		863
859	void	864	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
861	{	866	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	868	KeySym keysym;
864		869
…		…
986	while (row < end_row);	991	while (row < end_row);
987	}	992	}
988		993
989	scr_refresh ();	994	scr_refresh ();
990	scrollBar.show (1);	995	scrollBar.show (1);
991	#ifdef USE_XIM	996	#if USE_XIM
992	IMSendSpot ();	997	im_send_spot ();
993	#endif	998	#endif
994	}	999	}
995		1000
996	display->flush ();	1001	display->flush ();
997	}	1002	}
…		…
1015	flush ();	1020	flush ();
1016	}	1021	}
1017		1022
1018	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1019	void	1024	void
		1025	rxvt_term::cursor_blink_reset ()
		1026	{
		1027	if (hidden_cursor)
		1028	{
		1029	hidden_cursor = 0;
		1030	want_refresh = 1;
		1031	}
		1032
		1033	if (option (Opt_cursorBlink))
		1034	cursor_blink_ev.again ();
		1035	else
		1036	cursor_blink_ev.stop ();
		1037	}
		1038
		1039	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1041	{
1022	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1043	want_refresh = 1;
1024	refresh_check ();	1044	refresh_check ();
…		…
1042		1062
1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044	void	1064	void
1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046	{	1066	{
1047	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1048	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049	{	1069	{
1050	want_refresh = 1;	1070	want_refresh = 1;
1051	refresh_check ();	1071	refresh_check ();
1052	}	1072	}
1053	else	1073	else
…		…
1203	pty_write ();	1223	pty_write ();
1204		1224
1205	refresh_check ();	1225	refresh_check ();
1206	}	1226	}
1207		1227
1208	void	1228	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1210	{	1230	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1232	recolour_cursor ();
1213		1233
…		…
1218	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1219	#endif	1239	#endif
1220	}	1240	}
1221		1241
1222	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1223	void	1243	void ecb_cold
1224	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1225	{	1245	{
1226	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1227	return;	1247	return;
1228		1248
…		…
1230	XFlush (dpy);	1250	XFlush (dpy);
1231		1251
1232	hidden_pointer = 1;	1252	hidden_pointer = 1;
1233	}	1253	}
1234		1254
1235	void	1255	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1257	{
1238	make_current ();	1258	make_current ();
1239		1259
1240	pointer_blank ();	1260	pointer_blank ();
…		…
1332	32 + x,	1352	32 + x,
1333	32 + y);	1353	32 + y);
1334	}	1354	}
1335		1355
1336	/{{{ process an X event /	1356	/{{{ process an X event /
1337	void	1357	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1339	{	1359	{
1340	make_current ();	1360	make_current ();
1341		1361
1342	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1446	{	1466	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1468	;
1449		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1450	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1451	bool moved = false;
1452	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1453	{	1475	{
		1476	want_position_change = true;
		1477	if (!(bg_flags & BG_IS_VALID))
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1454	int x, y;	1484	int x, y;
		1485
1455	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1456	{	1487	{
1457	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1459	}	1490	}
1460	else	1491	else
1461	get_window_origin (x, y);	1492	get_window_origin (x, y);
1462		1493
1463	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1464	\|\| !(bg_flags & BG_IS_VALID))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465	moved = true;	1499	moved = true;
		1500	}
1466	}	1501	}
1467	#endif
1468		1502
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1504	{
1471	seen_resize = 1;	1505	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473	}	1507	}
1474	else	1508	else
1475	{	1509	{
1476	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1477	if (moved)	1511	if (moved)
1478	{
1479	if (mapped)
1480	update_background ();	1512	update_background ();
1481	else
1482	bg_invalidate ();
1483	}
1484	#endif	1513	#endif
1485	}	1514	}
1486		1515
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488	}	1517	}
…		…
1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1591	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1592	;
1564		1593
1565	if (scrollBar.state && ev.xany.window == scrollBar.win)	1594	if (scrollBar.state && ev.xany.window == scrollBar.win)
1566	{	1595	{
1567	scrollBar.state = STATE_IDLE;	1596	scrollBar.state = SB_STATE_IDLE;
1568	scrollBar.show (0);	1597	scrollBar.show (0);
1569	}	1598	}
1570	}	1599	}
1571	break;	1600	break;
1572		1601
…		…
1638	dist = int_bwidth - ev.xbutton.y;	1667	dist = int_bwidth - ev.xbutton.y;
1639	}	1668	}
1640	else	1669	else
1641	{	1670	{
1642	scroll_selection_dir = DN;	1671	scroll_selection_dir = DN;
1643	dist = ev.xbutton.y - (int_bwidth + height);	1672	dist = ev.xbutton.y - (int_bwidth + vt_height);
1644	}	1673	}
1645		1674
1646	scroll_selection_lines = Pixel2Height (dist)	1675	scroll_selection_lines = Pixel2Height (dist)
1647	/ SELECTION_SCROLL_LINE_SPEEDUP	1676	/ SELECTION_SCROLL_LINE_SPEEDUP
1648	+ 1;	1677	+ 1;
…		…
1660	#ifdef MOUSE_THRESHOLD	1689	#ifdef MOUSE_THRESHOLD
1661	}	1690	}
1662	#endif	1691	#endif
1663	}	1692	}
1664	}	1693	}
1665	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1694	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666	{	1695	{
1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1696	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668	MotionNotify, &ev))	1697	MotionNotify, &ev))
1669	;	1698	;
1670		1699
1671	XQueryPointer (dpy, scrollBar.win,	1700	XQueryPointer (dpy, scrollBar.win,
1672	&unused_root, &unused_child,	1701	&unused_root, &unused_child,
1673	&unused_root_x, &unused_root_y,	1702	&unused_root_x, &unused_root_y,
1674	&ev.xbutton.x, &ev.xbutton.y,	1703	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1704	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1705	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677	scrollBar.size ());	1706	scrollBar.size ());
1678	want_refresh = 1;	1707	want_refresh = 1;
1679	scrollBar.show (1);	1708	scrollBar.show (1);
1680	}	1709	}
1681	break;	1710	break;
1682	}	1711	}
1683		1712
1684	#if defined(CURSOR_BLINK)	1713	#if defined(CURSOR_BLINK)
1685	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1714	if (ev.type == KeyPress)
1686	{
1687	if (hidden_cursor)
1688	{
1689	hidden_cursor = 0;
1690	want_refresh = 1;
1691	}
1692
1693	cursor_blink_ev.again ();	1715	cursor_blink_reset ();
1694	}
1695	#endif	1716	#endif
1696		1717
1697	#if defined(POINTER_BLANK)	1718	#if defined(POINTER_BLANK)
1698	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1719	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699	{	1720	{
…		…
1710		1731
1711	refresh_check ();	1732	refresh_check ();
1712	}	1733	}
1713		1734
1714	#if ENABLE_FRILLS	1735	#if ENABLE_FRILLS
1715	void	1736	void ecb_cold
1716	rxvt_term::set_urgency (bool enable)	1737	rxvt_term::set_urgency (bool enable)
1717	{	1738	{
1718	if (enable == urgency_hint)	1739	if (enable == urgency_hint)
1719	return;	1740	return;
1720		1741
1721	if (XWMHints *h = XGetWMHints (dpy, parent))	1742	if (XWMHints *h = XGetWMHints (dpy, parent))
1722	{	1743	{
1723	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1744	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1724	XSetWMHints (dpy, parent, h);	1745	XSetWMHints (dpy, parent, h);
1725	urgency_hint = enable;	1746	urgency_hint = enable;
		1747	XFree (h);
1726	}	1748	}
1727	}	1749	}
1728	#endif	1750	#endif
1729		1751
1730	void	1752	void ecb_cold
1731	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1732	{	1754	{
1733	if (!focus)	1755	if (!focus)
1734	{	1756	{
1735	focus = 1;	1757	focus = 1;
1736	want_refresh = 1;	1758	want_refresh = 1;
1737		1759
1738	#if USE_XIM	1760	#if USE_XIM
1739	if (Input_Context != NULL)	1761	if (Input_Context != NULL)
1740	{	1762	{
1741	IMSetPosition ();	1763	im_set_position ();
1742	XSetICFocus (Input_Context);	1764	XSetICFocus (Input_Context);
1743	}	1765	}
1744	#endif	1766	#endif
1745	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1746	if (option (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
…		…
1760		1782
1761	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1783	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762	}	1784	}
1763	}	1785	}
1764		1786
1765	void	1787	void ecb_cold
1766	rxvt_term::focus_out ()	1788	rxvt_term::focus_out ()
1767	{	1789	{
1768	if (focus)	1790	if (focus)
1769	{	1791	{
1770	focus = 0;	1792	focus = 0;
…		…
1803		1825
1804	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1826	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805	}	1827	}
1806	}	1828	}
1807		1829
1808	void	1830	void ecb_cold
1809	rxvt_term::update_fade_color (unsigned int idx)	1831	rxvt_term::update_fade_color (unsigned int idx)
1810	{	1832	{
1811	#if OFF_FOCUS_FADING	1833	#if OFF_FOCUS_FADING
1812	if (rs[Rs_fade])	1834	if (rs[Rs_fade])
1813	{	1835	{
…		…
1816	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1838	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817	}	1839	}
1818	#endif	1840	#endif
1819	}	1841	}
1820		1842
1821	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1843	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1822	void	1844	void ecb_hot
1823	rxvt_term::rootwin_cb (XEvent &ev)	1845	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1846	{
1825	make_current ();	1847	make_current ();
1826		1848
1827	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1849	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1850	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829	return;	1851	return;
1830		1852
1831	# if ENABLE_TRANSPARENCY
1832	switch (ev.type)	1853	switch (ev.type)
1833	{	1854	{
1834	case PropertyNotify:	1855	case PropertyNotify:
1835	/*	1856	/*
1836	* if user used some Esetroot compatible prog to set the root bg,	1857	* if user used some Esetroot compatible prog to set the root bg,
1837	* use the property to determine the pixmap. We use it later on.	1858	* use the property to determine the pixmap. We use it later on.
1838	*/	1859	*/
1839	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1860	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1861	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	{	1862	{
		1863	#if BG_IMAGE_FROM_ROOT
1842	bg_set_root_pixmap ();	1864	bg_set_root_pixmap ();
1843	update_background ();	1865	update_background ();
		1866	#endif
		1867	#if ENABLE_PERL
		1868	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1869	#endif
1844	}	1870	}
1845		1871
1846	break;	1872	break;
1847	}	1873	}
1848	# endif
1849		1874
1850	refresh_check ();	1875	refresh_check ();
1851	}	1876	}
1852	#endif	1877	#endif
1853		1878
…		…
1977	if (scrollBar.upButton (ev.y))	2002	if (scrollBar.upButton (ev.y))
1978	direction = UP; /* up */	2003	direction = UP; /* up */
1979	else if (scrollBar.dnButton (ev.y))	2004	else if (scrollBar.dnButton (ev.y))
1980	direction = DN; /* down */	2005	direction = DN; /* down */
1981		2006
1982	scrollBar.state = STATE_IDLE;	2007	scrollBar.state = SB_STATE_IDLE;
1983	/*	2008	/*
1984	* Rxvt-style scrollbar:	2009	* Rxvt-style scrollbar:
1985	* move up if mouse is above slider	2010	* move up if mouse is above slider
1986	* move dn if mouse is below slider	2011	* move dn if mouse is below slider
1987	*	2012	*
…		…
2026	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2051	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027	#endif	2052	#endif
2028	if (scr_page (direction, 1))	2053	if (scr_page (direction, 1))
2029	{	2054	{
2030	if (direction == UP)	2055	if (direction == UP)
2031	scrollBar.state = STATE_UP;	2056	scrollBar.state = SB_STATE_UP;
2032	else	2057	else
2033	scrollBar.state = STATE_DOWN;	2058	scrollBar.state = SB_STATE_DOWN;
2034	}	2059	}
2035	}	2060	}
2036	else	2061	else
2037	switch (ev.button)	2062	switch (ev.button)
2038	{	2063	{
2039	case Button2:	2064	case Button2:
2040	switch (scrollBar.align)	2065	switch (scrollBar.align)
2041	{	2066	{
2042	case R_SB_ALIGN_TOP:	2067	case SB_ALIGN_TOP:
2043	csrO = 0;	2068	csrO = 0;
2044	break;	2069	break;
2045	case R_SB_ALIGN_CENTRE:	2070	case SB_ALIGN_CENTRE:
2046	csrO = (scrollBar.bot - scrollBar.top) / 2;	2071	csrO = (scrollBar.bot - scrollBar.top) / 2;
2047	break;	2072	break;
2048	case R_SB_ALIGN_BOTTOM:	2073	case SB_ALIGN_BOTTOM:
2049	csrO = scrollBar.bot - scrollBar.top;	2074	csrO = scrollBar.bot - scrollBar.top;
2050	break;	2075	break;
2051	}	2076	}
2052		2077
2053	if (scrollBar.style == R_SB_XTERM	2078	if (scrollBar.style == SB_STYLE_XTERM
2054	\|\| scrollbar_above_slider (ev.y)	2079	\|\| scrollBar.above_slider (ev.y)
2055	\|\| scrollbar_below_slider (ev.y))	2080	\|\| scrollBar.below_slider (ev.y))
2056	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2081	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057		2082
2058	scrollBar.state = STATE_MOTION;	2083	scrollBar.state = SB_STATE_MOTION;
2059	break;	2084	break;
2060		2085
2061	case Button1:	2086	case Button1:
2062	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2087	if (scrollBar.align == SB_ALIGN_CENTRE)
2063	csrO = ev.y - scrollBar.top;	2088	csrO = ev.y - scrollBar.top;
2064	/* FALLTHROUGH */	2089	/* FALLTHROUGH */
2065		2090
2066	case Button3:	2091	case Button3:
2067	if (scrollBar.style != R_SB_XTERM)	2092	if (scrollBar.style != SB_STYLE_XTERM)
2068	{	2093	{
2069	if (scrollbar_above_slider (ev.y))	2094	if (scrollBar.above_slider (ev.y))
2070	# ifdef RXVT_SCROLL_FULL	2095	# ifdef RXVT_SCROLL_FULL
2071	scr_page (UP, nrow - 1);	2096	scr_page (UP, nrow - 1);
2072	# else	2097	# else
2073	scr_page (UP, nrow / 4);	2098	scr_page (UP, nrow / 4);
2074	# endif	2099	# endif
2075	else if (scrollbar_below_slider (ev.y))	2100	else if (scrollBar.below_slider (ev.y))
2076	# ifdef RXVT_SCROLL_FULL	2101	# ifdef RXVT_SCROLL_FULL
2077	scr_page (DN, nrow - 1);	2102	scr_page (DN, nrow - 1);
2078	# else	2103	# else
2079	scr_page (DN, nrow / 4);	2104	scr_page (DN, nrow / 4);
2080	# endif	2105	# endif
2081	else	2106	else
2082	scrollBar.state = STATE_MOTION;	2107	scrollBar.state = SB_STATE_MOTION;
2083	}	2108	}
2084	else	2109	else
2085	{	2110	{
2086	scr_page ((ev.button == Button1 ? DN : UP),	2111	scr_page ((ev.button == Button1 ? DN : UP),
2087	(nrow	2112	(nrow
2088	* scrollbar_position (ev.y)	2113	* scrollBar.position (ev.y)
2089	/ scrollBar.size ()));	2114	/ scrollBar.size ()));
2090	}	2115	}
2091		2116
2092	break;	2117	break;
2093	}	2118	}
…		…
2104		2129
2105	csrO = 0; /* reset csr Offset */	2130	csrO = 0; /* reset csr Offset */
2106	if (!bypass_keystate)	2131	if (!bypass_keystate)
2107	reportmode = !! (priv_modes & PrivMode_mouse_report);	2132	reportmode = !! (priv_modes & PrivMode_mouse_report);
2108		2133
2109	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2134	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2110	{	2135	{
2111	scrollBar.state = STATE_IDLE;	2136	scrollBar.state = SB_STATE_IDLE;
2112	scrollBar.show (0);	2137	scrollBar.show (0);
2113	}	2138	}
2114		2139
2115	#ifdef SELECTION_SCROLLING	2140	#ifdef SELECTION_SCROLLING
2116	sel_scroll_ev.stop();	2141	sel_scroll_ev.stop();
…		…
2166	case Button3:	2191	case Button3:
2167	selection_make (ev.time);	2192	selection_make (ev.time);
2168	break;	2193	break;
2169		2194
2170	case Button2:	2195	case Button2:
2171	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2196	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2197	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173	break;	2198	break;
2174		2199
2175	#ifdef MOUSE_WHEEL	2200	#ifdef MOUSE_WHEEL
2176	case Button4:	2201	case Button4:
…		…
2211	}	2236	}
2212	}	2237	}
2213		2238
2214	/}}} /	2239	/}}} /
2215		2240
2216	void	2241	void ecb_hot
2217	rxvt_term::cmd_parse ()	2242	rxvt_term::cmd_parse ()
2218	{	2243	{
2219	wchar_t ch = NOCHAR;	2244	wchar_t ch = NOCHAR;
2220	char *seq_begin; // remember start of esc-sequence here	2245	char *seq_begin; // remember start of esc-sequence here
2221		2246
2222	for (;;)	2247	for (;;)
2223	{	2248	{
2224	if (expect_false (ch == NOCHAR))	2249	if (ecb_unlikely (ch == NOCHAR))
2225	{	2250	{
2226	seq_begin = cmdbuf_ptr;	2251	seq_begin = cmdbuf_ptr;
2227	ch = next_char ();	2252	ch = next_char ();
2228		2253
2229	if (ch == NOCHAR)	2254	if (ch == NOCHAR)
2230	break;	2255	break;
2231	}	2256	}
2232		2257
2233	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2258	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2234	{	2259	{
2235	if (expect_false (!seen_input))	2260	if (ecb_unlikely (!seen_input))
2236	{	2261	{
2237	seen_input = 1;	2262	seen_input = 1;
2238	// many badly-written programs (e.g. jed) contain a race condition:	2263	// many badly-written programs (e.g. jed) contain a race condition:
2239	// they first read the screensize and then install a SIGWINCH handler.	2264	// they first read the screensize and then install a SIGWINCH handler.
2240	// some window managers resize the window early, and these programs	2265	// some window managers resize the window early, and these programs
…		…
2253	wchar_t *str = buf;	2278	wchar_t *str = buf;
2254	wchar_t *eol = str + min (ncol, UBUFSIZ);	2279	wchar_t *eol = str + min (ncol, UBUFSIZ);
2255		2280
2256	for (;;)	2281	for (;;)
2257	{	2282	{
2258	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2283	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259	break;	2284	break;
2260		2285
2261	*str++ = ch;	2286	*str++ = ch;
2262		2287
2263	if (expect_false (ch == C0_LF \|\| str >= eol))	2288	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2264	{	2289	{
2265	if (ch == C0_LF)	2290	if (ch == C0_LF)
2266	nlines++;	2291	nlines++;
2267		2292
2268	refresh_count++;	2293	refresh_count++;
…		…
2340	}	2365	}
2341	}	2366	}
2342	}	2367	}
2343		2368
2344	// read the next character	2369	// read the next character
2345	wchar_t	2370	wchar_t ecb_hot
2346	rxvt_term::next_char () NOTHROW	2371	rxvt_term::next_char () NOTHROW
2347	{	2372	{
2348	while (cmdbuf_ptr < cmdbuf_endp)	2373	while (cmdbuf_ptr < cmdbuf_endp)
2349	{	2374	{
2350	// assume 7-bit to be ascii ALWAYS	2375	// assume 7-bit to be ascii ALWAYS
2351	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2376	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2352	return *cmdbuf_ptr++;	2377	return *cmdbuf_ptr++;
2353		2378
2354	wchar_t wc;	2379	wchar_t wc;
2355	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2380	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356		2381
…		…
2362	}	2387	}
2363		2388
2364	if (len == (size_t)-1)	2389	if (len == (size_t)-1)
2365	{	2390	{
2366	mbstate.reset (); // reset now undefined conversion state	2391	mbstate.reset (); // reset now undefined conversion state
		2392	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2393	// in which case we "erroneously" return the next byte which might be valid.
2367	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2394	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368	}	2395	}
2369		2396
2370	// assume wchar == unicode	2397	// assume wchar == unicode
2371	cmdbuf_ptr += len;	2398	cmdbuf_ptr += len;
…		…
2374		2401
2375	return NOCHAR;	2402	return NOCHAR;
2376	}	2403	}
2377		2404
2378	// read the next octet	2405	// read the next octet
2379	uint32_t	2406	uint32_t ecb_hot
2380	rxvt_term::next_octet () NOTHROW	2407	rxvt_term::next_octet () NOTHROW
2381	{	2408	{
2382	return cmdbuf_ptr < cmdbuf_endp	2409	return cmdbuf_ptr < cmdbuf_endp
2383	? (unsigned char)*cmdbuf_ptr++	2410	? (unsigned char)*cmdbuf_ptr++
2384	: NOCHAR;	2411	: NOCHAR;
2385	}	2412	}
2386		2413
2387	static class out_of_input out_of_input;	2414	static class out_of_input out_of_input;
2388		2415
2389	wchar_t	2416	wchar_t ecb_hot
2390	rxvt_term::cmd_getc () THROW ((class out_of_input))	2417	rxvt_term::cmd_getc () THROW ((class out_of_input))
2391	{	2418	{
2392	wchar_t c = next_char ();	2419	wchar_t c = next_char ();
2393		2420
2394	if (c == NOCHAR)	2421	if (c == NOCHAR)
2395	throw out_of_input;	2422	throw out_of_input;
2396		2423
2397	return c;	2424	return c;
2398	}	2425	}
2399		2426
2400	uint32_t	2427	uint32_t ecb_hot
2401	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2428	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402	{	2429	{
2403	uint32_t c = next_octet ();	2430	uint32_t c = next_octet ();
2404		2431
2405	if (c == NOCHAR)	2432	if (c == NOCHAR)
…		…
2409	}	2436	}
2410		2437
2411	/{{{ print pipe /	2438	/{{{ print pipe /
2412	/----------------------------------------------------------------------/	2439	/----------------------------------------------------------------------/
2413	#ifdef PRINTPIPE	2440	#ifdef PRINTPIPE
2414	FILE *	2441	FILE * ecb_cold
2415	rxvt_term::popen_printer ()	2442	rxvt_term::popen_printer ()
2416	{	2443	{
2417	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2444	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418		2445
2419	if (stream == NULL)	2446	if (stream == NULL)
2420	rxvt_warn ("can't open printer pipe, not printing.\n");	2447	rxvt_warn ("can't open printer pipe, not printing.\n");
2421		2448
2422	return stream;	2449	return stream;
2423	}	2450	}
2424		2451
2425	int	2452	int ecb_cold
2426	rxvt_term::pclose_printer (FILE *stream)	2453	rxvt_term::pclose_printer (FILE *stream)
2427	{	2454	{
2428	fflush (stream);	2455	fflush (stream);
2429	return pclose (stream);	2456	return pclose (stream);
2430	}	2457	}
2431		2458
2432	/*	2459	/*
2433	* simulate attached vt100 printer	2460	* simulate attached vt100 printer
2434	*/	2461	*/
2435	void	2462	void ecb_cold
2436	rxvt_term::process_print_pipe ()	2463	rxvt_term::process_print_pipe ()
2437	{	2464	{
2438	FILE *fd = popen_printer ();	2465	FILE *fd = popen_printer ();
2439		2466
2440	if (!fd)	2467	if (!fd)
…		…
2495	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2522	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2523	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497	};	2524	};
2498		2525
2499	/{{{ process non-printing single characters /	2526	/{{{ process non-printing single characters /
2500	void	2527	void ecb_hot
2501	rxvt_term::process_nonprinting (unicode_t ch)	2528	rxvt_term::process_nonprinting (unicode_t ch)
2502	{	2529	{
2503	switch (ch)	2530	switch (ch)
2504	{	2531	{
2505	case C0_ESC:	2532	case C0_ESC:
…		…
2551	}	2578	}
2552	/}}} /	2579	/}}} /
2553		2580
2554		2581
2555	/{{{ process VT52 escape sequences /	2582	/{{{ process VT52 escape sequences /
2556	void	2583	void ecb_cold
2557	rxvt_term::process_escape_vt52 (unicode_t ch)	2584	rxvt_term::process_escape_vt52 (unicode_t ch)
2558	{	2585	{
2559	int row, col;	2586	int row, col;
2560		2587
2561	switch (ch)	2588	switch (ch)
…		…
2595	break;	2622	break;
2596	case 'Z': /* identify the terminal type */	2623	case 'Z': /* identify the terminal type */
2597	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2624	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598	break;	2625	break;
2599	case '<': /* turn off VT52 mode */	2626	case '<': /* turn off VT52 mode */
2600	set_privmode (PrivMode_vt52, 0);	2627	priv_modes &= ~PrivMode_vt52;
2601	break;	2628	break;
2602	case 'F': /* use special graphics character set */	2629	case 'F': /* use special graphics character set */
2603	case 'G': /* use regular character set */	2630	case 'G': /* use regular character set */
2604	/* unimplemented */	2631	/* unimplemented */
2605	break;	2632	break;
…		…
2611	}	2638	}
2612	/}}} /	2639	/}}} /
2613		2640
2614		2641
2615	/{{{ process escape sequences /	2642	/{{{ process escape sequences /
2616	void	2643	void ecb_hot
2617	rxvt_term::process_escape_seq ()	2644	rxvt_term::process_escape_seq ()
2618	{	2645	{
2619	unicode_t ch = cmd_getc ();	2646	unicode_t ch = cmd_getc ();
2620		2647
2621	if (priv_modes & PrivMode_vt52)	2648	if (priv_modes & PrivMode_vt52)
…		…
2656	#if !ENABLE_MINIMAL	2683	#if !ENABLE_MINIMAL
2657	case '9':	2684	case '9':
2658	scr_forwardindex ();	2685	scr_forwardindex ();
2659	break;	2686	break;
2660	#endif	2687	#endif
		2688	// DECPAM/DECPNM
2661	case '=':	2689	case '=':
		2690	priv_modes \|= PrivMode_aplKP;
		2691	break;
2662	case '>':	2692	case '>':
2663	set_privmode (PrivMode_aplKP, ch == '=');	2693	priv_modes &= ~PrivMode_aplKP;
2664	break;	2694	break;
2665		2695
2666	case C1_40:	2696	case C1_40:
2667	cmd_getc ();	2697	cmd_getc ();
2668	break;	2698	break;
…		…
2672		2702
2673	/* 8.3.87: NEXT LINE */	2703	/* 8.3.87: NEXT LINE */
2674	case C1_NEL: /* ESC E */	2704	case C1_NEL: /* ESC E */
2675	{	2705	{
2676	wchar_t nlcr[] = { C0_LF, C0_CR };	2706	wchar_t nlcr[] = { C0_LF, C0_CR };
2677	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2707	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678	}	2708	}
2679	break;	2709	break;
2680		2710
2681	/* kidnapped escape sequence: Should be 8.3.48 */	2711	/* kidnapped escape sequence: Should be 8.3.48 */
2682	case C1_ESA: /* ESC G */	2712	case C1_ESA: /* ESC G */
…		…
2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2800	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2801	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2802	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2773	};	2803	};
2774		2804
2775	void	2805	void ecb_hot
2776	rxvt_term::process_csi_seq ()	2806	rxvt_term::process_csi_seq ()
2777	{	2807	{
2778	unicode_t ch, priv, i;	2808	unicode_t ch, priv, i;
2779	unsigned int nargs, p;	2809	unsigned int nargs, p;
2780	int n, ndef;	2810	int n, ndef;
…		…
2858	scr_soft_reset ();	2888	scr_soft_reset ();
2859		2889
2860	static const int pm_h[] = { 7, 25 };	2890	static const int pm_h[] = { 7, 25 };
2861	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2891	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862		2892
2863	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2893	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2894	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865	}	2895	}
2866	break;	2896	break;
2867	}	2897	}
2868		2898
2869	return;	2899	return;
…		…
2887	}	2917	}
2888	break;	2918	break;
2889	#endif	2919	#endif
2890		2920
2891	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2921	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2922	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893	arg[0] = -arg[0];	2923	arg[0] = -arg[0];
2894	/* FALLTHROUGH */	2924	/* FALLTHROUGH */
2895	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2925	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2926	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897	scr_gotorc (arg[0], 0, RELATIVE);	2927	scr_gotorc (arg[0], 0, RELATIVE);
2898	break;	2928	break;
2899		2929
2900	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2930	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2931	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3134	break;	3164	break;
3135		3165
3136	//case 9: NYI, TODO, restore maximized window or maximize window	3166	//case 9: NYI, TODO, restore maximized window or maximize window
3137	default:	3167	default:
3138	if (args[0] >= 24) /* set height (chars) */	3168	if (args[0] >= 24) /* set height (chars) */
3139	set_widthheight ((unsigned int)width,	3169	set_widthheight ((unsigned int)vt_width,
3140	(unsigned int) (args[1] * fheight));	3170	(unsigned int) (args[1] * fheight));
3141	break;	3171	break;
3142		3172
3143	/*	3173	/*
3144	* reports - some output format copied from XTerm	3174	* reports - some output format copied from XTerm
…		…
3423	break;	3453	break;
3424	#endif	3454	#endif
3425	case URxvt_Color_border:	3455	case URxvt_Color_border:
3426	process_color_seq (op, Color_border, str, resp);	3456	process_color_seq (op, Color_border, str, resp);
3427	break;	3457	break;
3428	#if ENABLE_TRANSPARENCY	3458
		3459	#if BG_IMAGE_FROM_ROOT
3429	case URxvt_Color_tint:	3460	case URxvt_Color_tint:
3430	process_color_seq (op, Color_tint, str, resp);	3461	process_color_seq (op, Color_tint, str, resp);
3431	{	3462	{
3432	bool changed = false;	3463	bool changed = false;
3433		3464
3434	if (ISSET_PIXCOLOR (Color_tint))	3465	if (ISSET_PIXCOLOR (Color_tint))
3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3466	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436		3467
3437	if (changed)	3468	if (changed)
3438	update_background ();	3469	update_background ();
3439	}	3470	}
3440		3471
…		…
3444	#if BG_IMAGE_FROM_FILE	3475	#if BG_IMAGE_FROM_FILE
3445	case Rxvt_Pixmap:	3476	case Rxvt_Pixmap:
3446	if (!strcmp (str, "?"))	3477	if (!strcmp (str, "?"))
3447	{	3478	{
3448	char str[256];	3479	char str[256];
		3480	int h_scale = fimage.h_scale;
		3481	int v_scale = fimage.v_scale;
		3482	int h_align = fimage.h_align;
		3483	int v_align = fimage.v_align;
3449		3484
3450	sprintf (str, "[%dx%d+%d+%d]",	3485	sprintf (str, "[%dx%d+%d+%d]",
3451	min (h_scale, 32767), min (v_scale, 32767),	3486	h_scale, v_scale,
3452	min (h_align, 32767), min (v_align, 32767));	3487	h_align, v_align);
3453	process_xterm_seq (XTerm_title, str, CHAR_ST);	3488	process_xterm_seq (XTerm_title, str, CHAR_ST);
3454	}	3489	}
3455	else	3490	else
3456	{	3491	{
3457	int changed = 0;	3492	bool changed = false;
3458		3493
3459	if (*str != ';')	3494	if (*str != ';')
3460	{	3495	{
3461	if (bg_set_file (str)) /* change pixmap */	3496	try
3462	{	3497	{
		3498	fimage.set_file_geometry (this, str);
3463	changed++;	3499	changed = true;
3464	str = strchr (str, ';');
3465	if (str == NULL)
3466	bg_set_default_geometry ();
3467	else	3500	}
3468	bg_set_geometry (str+1);	3501	catch (const class rxvt_failure_exception &e)
		3502	{
3469	}	3503	}
3470	}	3504	}
3471	else	3505	else
3472	{	3506	{
3473	str++;	3507	str++;
3474	if (bg_set_geometry (str, true))	3508	if (fimage.set_geometry (str, true))
3475	changed++;	3509	changed = true;
3476	}	3510	}
3477		3511
3478	if (changed)	3512	if (changed)
3479	{	3513	{
3480	if (bg_window_position_sensitive ())	3514	if (bg_window_position_sensitive ())
3481	{	3515	{
3482	int x, y;	3516	int x, y;
3483	get_window_origin (x, y);	3517	get_window_origin (x, y);
3484	bg_set_position (x, y);	3518	parent_x = x;
		3519	parent_y = y;
3485	}	3520	}
3486	update_background ();	3521	update_background ();
3487	}	3522	}
3488	}	3523	}
3489	break;	3524	break;
…		…
3579	* 's' = save	3614	* 's' = save
3580	* 'r' = restore	3615	* 'r' = restore
3581	* 't' = toggle	3616	* 't' = toggle
3582	* so no need for fancy checking	3617	* so no need for fancy checking
3583	*/	3618	*/
3584	int	3619	int ecb_cold
3585	rxvt_term::privcases (int mode, unsigned long bit)	3620	rxvt_term::privcases (int mode, unsigned long bit)
3586	{	3621	{
3587	int state;	3622	int state;
3588		3623
3589	if (mode == 's')	3624	if (mode == 's')
3590	{	3625	{
3591	SavedModes \|= (priv_modes & bit);	3626	if (priv_modes & bit)
		3627	SavedModes \|= bit;
		3628	else
		3629	SavedModes &= ~bit;
3592	return -1;	3630	return -1;
3593	}	3631	}
3594	else	3632	else
3595	{	3633	{
3596	if (mode == 'r')	3634	if (mode == 'r')
3597	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3635	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598	else	3636	else
3599	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3637	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600		3638
3601	set_privmode (bit, state);	3639	if (state)
		3640	priv_modes \|= bit;
		3641	else
		3642	priv_modes &= ~bit;
3602	}	3643	}
3603		3644
3604	return state;	3645	return state;
3605	}	3646	}
3606		3647
3607	/* we're not using priv _yet_ */	3648	/* we're not using priv _yet_ */
3608	void	3649	void
3609	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3650	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3610	{	3651	{
3611	unsigned int i, j;	3652	unsigned int i, j;
3612	int state;	3653	int state;
3613		3654
3614	static const struct	3655	static const struct
3615	{	3656	{
3616	const int argval;	3657	const int argval;
3617	const unsigned long bit;	3658	const unsigned long bit;
3618	} argtopriv[] = {	3659	} argtopriv[] = {
3619	{ 1, PrivMode_aplCUR }, // DECCKM	3660	{ 1, PrivMode_aplCUR }, // DECCKM
3620	{ 2, PrivMode_vt52 },	3661	{ 2, PrivMode_vt52 }, // DECANM
3621	{ 3, PrivMode_132 }, // DECCOLM	3662	{ 3, PrivMode_132 }, // DECCOLM
3622	{ 4, PrivMode_smoothScroll }, // DECSCLM	3663	{ 4, PrivMode_smoothScroll }, // DECSCLM
3623	{ 5, PrivMode_rVideo }, // DECSCNM	3664	{ 5, PrivMode_rVideo }, // DECSCNM
3624	{ 6, PrivMode_relOrigin }, // DECOM	3665	{ 6, PrivMode_relOrigin }, // DECOM
3625	{ 7, PrivMode_Autowrap }, // DECAWM	3666	{ 7, PrivMode_Autowrap }, // DECAWM
3626	// 8, auto-repeat keys // DECARM	3667	// 8, auto-repeat keys // DECARM
3627	{ 9, PrivMode_MouseX10 },	3668	{ 9, PrivMode_MouseX10 },
3628	// 18 end FF to printer after print screen	3669	// 18 end FF to printer after print screen
3629	// 19 Print screen prints full screen/scroll region	3670	// 19 Print screen prints full screen/scroll region
3630	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3671	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631	#ifdef scrollBar_esc	3672	#ifdef scrollBar_esc
3632	{ scrollBar_esc, PrivMode_scrollBar },	3673	{ scrollBar_esc, PrivMode_scrollBar },
3633	#endif	3674	#endif
3634	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3675	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3635	// 38, tektronix mode // DECTEK	3676	// 38, tektronix mode // DECTEK
3636	{ 40, PrivMode_132OK },	3677	{ 40, PrivMode_132OK },
3637	// 41 xterm more fixes NYI	3678	// 41 xterm more fixes NYI
3638	// 45 margin bell NYI	3679	// 45 margin bell NYI
3639	// 46 start logging	3680	// 46 start logging
3640	{ 47, PrivMode_Screen },	3681	{ 47, PrivMode_Screen },
3641	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3682	{ 66, PrivMode_aplKP }, // DECNKM
3642	#ifndef NO_BACKSPACE_KEY	3683	#ifndef NO_BACKSPACE_KEY
3643	{ 67, PrivMode_BackSpace }, // DECBKM	3684	{ 67, PrivMode_BackSpace }, // DECBKM
3644	#endif	3685	#endif
3645	{ 1000, PrivMode_MouseX11 },	3686	{ 1000, PrivMode_MouseX11 },
3646	{ 1002, PrivMode_MouseBtnEvent },	3687	{ 1002, PrivMode_MouseBtnEvent },
…		…
3675	for (i = 0; i < nargs; i++)	3716	for (i = 0; i < nargs; i++)
3676	{	3717	{
3677	state = -1;	3718	state = -1;
3678		3719
3679	/* basic handling */	3720	/* basic handling */
3680	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3721	for (j = 0; j < ecb_array_length (argtopriv); j++)
3681	if (argtopriv[j].argval == arg[i])	3722	if (argtopriv[j].argval == arg[i])
3682	{	3723	{
3683	state = privcases (mode, argtopriv[j].bit);	3724	state = privcases (mode, argtopriv[j].bit);
3684	break;	3725	break;
3685	}	3726	}
…		…
3711	case 2: /* VT52 mode */	3752	case 2: /* VT52 mode */
3712	/* oddball mode. should be set regardless of set/reset	3753	/* oddball mode. should be set regardless of set/reset
3713	* parameter. Return from VT52 mode with an ESC < from	3754	* parameter. Return from VT52 mode with an ESC < from
3714	* within VT52 mode	3755	* within VT52 mode
3715	*/	3756	*/
3716	set_privmode (PrivMode_vt52, 1);	3757	priv_modes \|= PrivMode_vt52;
3717	break;	3758	break;
3718	case 3: /* 80/132 */	3759	case 3: /* 80/132 */
3719	if (priv_modes & PrivMode_132OK)	3760	if (priv_modes & PrivMode_132OK)
3720	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3761	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721	break;	3762	break;
…		…
3736	if (state) /* orthogonal */	3777	if (state) /* orthogonal */
3737	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3778	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3738	break;	3779	break;
3739	#ifdef scrollBar_esc	3780	#ifdef scrollBar_esc
3740	case scrollBar_esc:	3781	case scrollBar_esc:
3741	if (scrollBar.map (state))	3782	scrollBar.map (state);
3742	{
3743	resize_all_windows (0, 0, 0);	3783	resize_all_windows (0, 0, 0);
3744	scr_touch (true);	3784	scr_touch (true);
3745	}
3746	break;	3785	break;
3747	#endif	3786	#endif
3748	case 25: /* visible/invisible cursor */	3787	case 25: /* visible/invisible cursor */
3749	scr_cursor_visible (state);	3788	scr_cursor_visible (state);
3750	break;	3789	break;
…		…
3805	}	3844	}
3806	}	3845	}
3807	/}}} /	3846	/}}} /
3808		3847
3809	/{{{ process sgr sequences /	3848	/{{{ process sgr sequences /
3810	void	3849	void ecb_hot
3811	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3850	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3812	{	3851	{
3813	unsigned int i;	3852	unsigned int i;
3814	short rendset;	3853	short rendset;
3815	int rendstyle;	3854	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs. Revision 1.527 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.527 by sf-exg, Sat Dec 29 14:23:35 2012 UTC