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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.521 by sf-exg, Sun Jun 10 16:00:26 2012 UTC

…		…
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[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		267
267	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
268	{	269	{
269	char mb[16];	270	char mb[MB_LEN_MAX];
270	int len;	271	int len;
271		272
272	// allow verbatim 0-bytes and control-bytes to be entered	273	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	274	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	275	len = wctomb (mb, ch);
275	else	276	else
276	{	277	{
277	mb[0] = ch[0];	278	mb[0] = ch;
278	len = 1;	279	len = 1;
279	}	280	}
280		281
281	if (len > 0)	282	if (len > 0)
282	tt_write (mb, len);	283	tt_write (mb, len);
…		…
285	}	286	}
286		287
287	iso14755buf = 0;	288	iso14755buf = 0;
288	}	289	}
289		290
290	static int	291	static int ecb_cold
291	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
292	{	293	{
293	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
294	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
295	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
304		305
305	return -1;	306	return -1;
306	}	307	}
307	#endif	308	#endif
308		309
309	static inline KeySym	310	static inline KeySym ecb_cold
310	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
311	{	312	{
312	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
313	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
314	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
340	# endif	341	# endif
341	#endif	342	#endif
342	return keysym;	343	return keysym;
343	}	344	}
344		345
345	static inline int	346	static inline int ecb_cold
346	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
347	{	348	{
348	int param = 0;	349	int param = 0;
349		350
350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
399	break;	400	break;
400	}	401	}
401	return param;	402	return param;
402	}	403	}
403		404
404	void	405	void ecb_cold
405	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
406	{	407	{
407	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
408	KeySym keysym;	409	KeySym keysym;
409	int valid_keysym;	410	int valid_keysym;
…		…
424	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
425	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
426		427
427	kbuf[0] = 0;	428	kbuf[0] = 0;
428		429
429	#ifdef USE_XIM	430	#if USE_XIM
430	if (Input_Context)	431	if (Input_Context)
431	{	432	{
432	Status status_return;	433	Status status_return;
433		434
434	#if 0	435	#if 0
…		…
779	}	780	}
780		781
781	if (newlen)	782	if (newlen)
782	len = strlen (kbuf);	783	len = strlen (kbuf);
783		784
		785	if (len > 0)
		786	{
784	/*	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	/*
785	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
786	*/	801	*/
787	#ifdef META8_OPTION	802	#ifdef META8_OPTION
788	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
789	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
790	#endif	805	#endif
		806	}
791		807
792	}	808	}
793	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
794	{	810	{
795	len = 1;	811	len = 1;
…		…
829	{	845	{
830	view_start = 0;	846	view_start = 0;
831	want_refresh = 1;	847	want_refresh = 1;
832	}	848	}
833		849
834	/*
835	* these modifications only affect the static keybuffer
836	* pass Shift/Control indicators for function keys ending with `~'
837	*
838	* eg,
839	* Prior = "ESC[5~"
840	* Shift+Prior = "ESC[5$"
841	* Ctrl+Prior = "ESC[5^"
842	* Ctrl+Shift+Prior = "ESC[5@"
843	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844	*/
845	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848	/* escape prefix */	850	/* escape prefix */
849	if (meta	851	if (meta
850	#ifdef META8_OPTION	852	#ifdef META8_OPTION
851	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
852	#endif	854	#endif
…		…
857	}	859	}
858		860
859	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
860	}	862	}
861		863
862	void	864	void ecb_cold
863	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
864	{	866	{
865	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
866	KeySym keysym;	868	KeySym keysym;
867		869
…		…
989	while (row < end_row);	991	while (row < end_row);
990	}	992	}
991		993
992	scr_refresh ();	994	scr_refresh ();
993	scrollBar.show (1);	995	scrollBar.show (1);
994	#ifdef USE_XIM	996	#if USE_XIM
995	IMSendSpot ();	997	im_send_spot ();
996	#endif	998	#endif
997	}	999	}
998		1000
999	display->flush ();	1001	display->flush ();
1000	}	1002	}
…		…
1018	flush ();	1020	flush ();
1019	}	1021	}
1020		1022
1021	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1022	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
1023	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024	{	1041	{
1025	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1026	want_refresh = 1;	1043	want_refresh = 1;
1027	refresh_check ();	1044	refresh_check ();
…		…
1045		1062
1046	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047	void	1064	void
1048	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049	{	1066	{
1050	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1051	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052	{	1069	{
1053	want_refresh = 1;	1070	want_refresh = 1;
1054	refresh_check ();	1071	refresh_check ();
1055	}	1072	}
1056	else	1073	else
…		…
1206	pty_write ();	1223	pty_write ();
1207		1224
1208	refresh_check ();	1225	refresh_check ();
1209	}	1226	}
1210		1227
1211	void	1228	void ecb_cold
1212	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1213	{	1230	{
1214	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1215	recolour_cursor ();	1232	recolour_cursor ();
1216		1233
…		…
1221	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1222	#endif	1239	#endif
1223	}	1240	}
1224		1241
1225	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1226	void	1243	void ecb_cold
1227	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1228	{	1245	{
1229	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1230	return;	1247	return;
1231		1248
…		…
1233	XFlush (dpy);	1250	XFlush (dpy);
1234		1251
1235	hidden_pointer = 1;	1252	hidden_pointer = 1;
1236	}	1253	}
1237		1254
1238	void	1255	void ecb_cold
1239	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1240	{	1257	{
1241	make_current ();	1258	make_current ();
1242		1259
1243	pointer_blank ();	1260	pointer_blank ();
…		…
1335	32 + x,	1352	32 + x,
1336	32 + y);	1353	32 + y);
1337	}	1354	}
1338		1355
1339	/{{{ process an X event /	1356	/{{{ process an X event /
1340	void	1357	void ecb_hot
1341	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1342	{	1359	{
1343	make_current ();	1360	make_current ();
1344		1361
1345	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1448	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1449	{	1466	{
1450	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451	;	1468	;
1452		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
1453	#ifdef HAVE_BG_PIXMAP	1472	#ifdef HAVE_BG_PIXMAP
		1473	if (bg_window_position_sensitive ())
		1474	want_position_change = true;
		1475	#endif
		1476
1454	bool moved = false;	1477	bool moved = false;
1455	if (bg_window_position_sensitive ())	1478
		1479	if (want_position_change)
1456	{	1480	{
1457	int x, y;	1481	int x, y;
		1482
1458	if (ev.xconfigure.send_event)	1483	if (ev.xconfigure.send_event)
1459	{	1484	{
1460	x = ev.xconfigure.x;	1485	x = ev.xconfigure.x;
1461	y = ev.xconfigure.y;	1486	y = ev.xconfigure.y;
1462	}	1487	}
1463	else	1488	else
1464	get_window_origin (x, y);	1489	get_window_origin (x, y);
1465		1490
1466	if (bg_set_position (x, y)	1491	if (x != parent_x \|\| y != parent_y)
		1492	{
		1493	parent_x = x;
		1494	parent_y = y;
		1495	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1496	moved = true;
		1497	}
		1498
1467	\|\| !(bg_flags & BG_IS_VALID))	1499	if (!(bg_flags & BG_IS_VALID))
1468	moved = true;	1500	moved = true;
1469	}	1501	}
1470	#endif
1471		1502
1472	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1473	{	1504	{
1474	seen_resize = 1;	1505	seen_resize = 1;
1475	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476	}	1507	}
1477	else	1508	else
1478	{	1509	{
1479	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1480	if (moved)	1511	if (moved)
1481	{
1482	if (mapped)
1483	update_background ();	1512	update_background ();
1484	else
1485	bg_invalidate ();
1486	}
1487	#endif	1513	#endif
1488	}	1514	}
1489		1515
1490	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491	}	1517	}
…		…
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1591	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1592	;
1567		1593
1568	if (scrollBar.state && ev.xany.window == scrollBar.win)	1594	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1595	{
1570	scrollBar.state = STATE_IDLE;	1596	scrollBar.state = SB_STATE_IDLE;
1571	scrollBar.show (0);	1597	scrollBar.show (0);
1572	}	1598	}
1573	}	1599	}
1574	break;	1600	break;
1575		1601
…		…
1641	dist = int_bwidth - ev.xbutton.y;	1667	dist = int_bwidth - ev.xbutton.y;
1642	}	1668	}
1643	else	1669	else
1644	{	1670	{
1645	scroll_selection_dir = DN;	1671	scroll_selection_dir = DN;
1646	dist = ev.xbutton.y - (int_bwidth + height);	1672	dist = ev.xbutton.y - (int_bwidth + vt_height);
1647	}	1673	}
1648		1674
1649	scroll_selection_lines = Pixel2Height (dist)	1675	scroll_selection_lines = Pixel2Height (dist)
1650	/ SELECTION_SCROLL_LINE_SPEEDUP	1676	/ SELECTION_SCROLL_LINE_SPEEDUP
1651	+ 1;	1677	+ 1;
…		…
1663	#ifdef MOUSE_THRESHOLD	1689	#ifdef MOUSE_THRESHOLD
1664	}	1690	}
1665	#endif	1691	#endif
1666	}	1692	}
1667	}	1693	}
1668	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1694	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669	{	1695	{
1670	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1696	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1697	MotionNotify, &ev))
1672	;	1698	;
1673		1699
1674	XQueryPointer (dpy, scrollBar.win,	1700	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1701	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1702	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1703	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1704	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1705	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680	scrollBar.size ());	1706	scrollBar.size ());
1681	want_refresh = 1;	1707	want_refresh = 1;
1682	scrollBar.show (1);	1708	scrollBar.show (1);
1683	}	1709	}
1684	break;	1710	break;
1685	}	1711	}
1686		1712
1687	#if defined(CURSOR_BLINK)	1713	#if defined(CURSOR_BLINK)
1688	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1714	if (ev.type == KeyPress)
1689	{
1690	if (hidden_cursor)
1691	{
1692	hidden_cursor = 0;
1693	want_refresh = 1;
1694	}
1695
1696	cursor_blink_ev.again ();	1715	cursor_blink_reset ();
1697	}
1698	#endif	1716	#endif
1699		1717
1700	#if defined(POINTER_BLANK)	1718	#if defined(POINTER_BLANK)
1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1719	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702	{	1720	{
…		…
1713		1731
1714	refresh_check ();	1732	refresh_check ();
1715	}	1733	}
1716		1734
1717	#if ENABLE_FRILLS	1735	#if ENABLE_FRILLS
1718	void	1736	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1737	rxvt_term::set_urgency (bool enable)
1720	{	1738	{
1721	if (enable == urgency_hint)	1739	if (enable == urgency_hint)
1722	return;	1740	return;
1723		1741
1724	if (XWMHints *h = XGetWMHints (dpy, parent))	1742	if (XWMHints *h = XGetWMHints (dpy, parent))
1725	{	1743	{
1726	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1744	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1727	XSetWMHints (dpy, parent, h);	1745	XSetWMHints (dpy, parent, h);
1728	urgency_hint = enable;	1746	urgency_hint = enable;
		1747	XFree (h);
1729	}	1748	}
1730	}	1749	}
1731	#endif	1750	#endif
1732		1751
1733	void	1752	void ecb_cold
1734	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1735	{	1754	{
1736	if (!focus)	1755	if (!focus)
1737	{	1756	{
1738	focus = 1;	1757	focus = 1;
1739	want_refresh = 1;	1758	want_refresh = 1;
1740		1759
1741	#if USE_XIM	1760	#if USE_XIM
1742	if (Input_Context != NULL)	1761	if (Input_Context != NULL)
1743	{	1762	{
1744	IMSetPosition ();	1763	im_set_position ();
1745	XSetICFocus (Input_Context);	1764	XSetICFocus (Input_Context);
1746	}	1765	}
1747	#endif	1766	#endif
1748	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1749	if (option (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
…		…
1763		1782
1764	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1783	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765	}	1784	}
1766	}	1785	}
1767		1786
1768	void	1787	void ecb_cold
1769	rxvt_term::focus_out ()	1788	rxvt_term::focus_out ()
1770	{	1789	{
1771	if (focus)	1790	if (focus)
1772	{	1791	{
1773	focus = 0;	1792	focus = 0;
…		…
1806		1825
1807	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1826	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808	}	1827	}
1809	}	1828	}
1810		1829
1811	void	1830	void ecb_cold
1812	rxvt_term::update_fade_color (unsigned int idx)	1831	rxvt_term::update_fade_color (unsigned int idx)
1813	{	1832	{
1814	#if OFF_FOCUS_FADING	1833	#if OFF_FOCUS_FADING
1815	if (rs[Rs_fade])	1834	if (rs[Rs_fade])
1816	{	1835	{
…		…
1820	}	1839	}
1821	#endif	1840	#endif
1822	}	1841	}
1823		1842
1824	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1843	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1825	void	1844	void ecb_hot
1826	rxvt_term::rootwin_cb (XEvent &ev)	1845	rxvt_term::rootwin_cb (XEvent &ev)
1827	{	1846	{
1828	make_current ();	1847	make_current ();
1829		1848
1830	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1849	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1850	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832	return;	1851	return;
1833		1852
1834	# if ENABLE_TRANSPARENCY
1835	switch (ev.type)	1853	switch (ev.type)
1836	{	1854	{
1837	case PropertyNotify:	1855	case PropertyNotify:
1838	/*	1856	/*
1839	* 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,
1840	* 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.
1841	*/	1859	*/
1842	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1860	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1861	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844	{	1862	{
		1863	# if ENABLE_TRANSPARENCY
1845	bg_set_root_pixmap ();	1864	bg_set_root_pixmap ();
1846	update_background ();	1865	update_background ();
		1866	#endif
		1867	#if ENABLE_PERL
		1868	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1869	#endif
1847	}	1870	}
1848		1871
1849	break;	1872	break;
1850	}	1873	}
1851	# endif
1852		1874
1853	refresh_check ();	1875	refresh_check ();
1854	}	1876	}
1855	#endif	1877	#endif
1856		1878
…		…
1980	if (scrollBar.upButton (ev.y))	2002	if (scrollBar.upButton (ev.y))
1981	direction = UP; /* up */	2003	direction = UP; /* up */
1982	else if (scrollBar.dnButton (ev.y))	2004	else if (scrollBar.dnButton (ev.y))
1983	direction = DN; /* down */	2005	direction = DN; /* down */
1984		2006
1985	scrollBar.state = STATE_IDLE;	2007	scrollBar.state = SB_STATE_IDLE;
1986	/*	2008	/*
1987	* Rxvt-style scrollbar:	2009	* Rxvt-style scrollbar:
1988	* move up if mouse is above slider	2010	* move up if mouse is above slider
1989	* move dn if mouse is below slider	2011	* move dn if mouse is below slider
1990	*	2012	*
…		…
2029	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2051	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	2052	#endif
2031	if (scr_page (direction, 1))	2053	if (scr_page (direction, 1))
2032	{	2054	{
2033	if (direction == UP)	2055	if (direction == UP)
2034	scrollBar.state = STATE_UP;	2056	scrollBar.state = SB_STATE_UP;
2035	else	2057	else
2036	scrollBar.state = STATE_DOWN;	2058	scrollBar.state = SB_STATE_DOWN;
2037	}	2059	}
2038	}	2060	}
2039	else	2061	else
2040	switch (ev.button)	2062	switch (ev.button)
2041	{	2063	{
2042	case Button2:	2064	case Button2:
2043	switch (scrollBar.align)	2065	switch (scrollBar.align)
2044	{	2066	{
2045	case R_SB_ALIGN_TOP:	2067	case SB_ALIGN_TOP:
2046	csrO = 0;	2068	csrO = 0;
2047	break;	2069	break;
2048	case R_SB_ALIGN_CENTRE:	2070	case SB_ALIGN_CENTRE:
2049	csrO = (scrollBar.bot - scrollBar.top) / 2;	2071	csrO = (scrollBar.bot - scrollBar.top) / 2;
2050	break;	2072	break;
2051	case R_SB_ALIGN_BOTTOM:	2073	case SB_ALIGN_BOTTOM:
2052	csrO = scrollBar.bot - scrollBar.top;	2074	csrO = scrollBar.bot - scrollBar.top;
2053	break;	2075	break;
2054	}	2076	}
2055		2077
2056	if (scrollBar.style == R_SB_XTERM	2078	if (scrollBar.style == SB_STYLE_XTERM
2057	\|\| scrollbar_above_slider (ev.y)	2079	\|\| scrollBar.above_slider (ev.y)
2058	\|\| scrollbar_below_slider (ev.y))	2080	\|\| scrollBar.below_slider (ev.y))
2059	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2081	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060		2082
2061	scrollBar.state = STATE_MOTION;	2083	scrollBar.state = SB_STATE_MOTION;
2062	break;	2084	break;
2063		2085
2064	case Button1:	2086	case Button1:
2065	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2087	if (scrollBar.align == SB_ALIGN_CENTRE)
2066	csrO = ev.y - scrollBar.top;	2088	csrO = ev.y - scrollBar.top;
2067	/* FALLTHROUGH */	2089	/* FALLTHROUGH */
2068		2090
2069	case Button3:	2091	case Button3:
2070	if (scrollBar.style != R_SB_XTERM)	2092	if (scrollBar.style != SB_STYLE_XTERM)
2071	{	2093	{
2072	if (scrollbar_above_slider (ev.y))	2094	if (scrollBar.above_slider (ev.y))
2073	# ifdef RXVT_SCROLL_FULL	2095	# ifdef RXVT_SCROLL_FULL
2074	scr_page (UP, nrow - 1);	2096	scr_page (UP, nrow - 1);
2075	# else	2097	# else
2076	scr_page (UP, nrow / 4);	2098	scr_page (UP, nrow / 4);
2077	# endif	2099	# endif
2078	else if (scrollbar_below_slider (ev.y))	2100	else if (scrollBar.below_slider (ev.y))
2079	# ifdef RXVT_SCROLL_FULL	2101	# ifdef RXVT_SCROLL_FULL
2080	scr_page (DN, nrow - 1);	2102	scr_page (DN, nrow - 1);
2081	# else	2103	# else
2082	scr_page (DN, nrow / 4);	2104	scr_page (DN, nrow / 4);
2083	# endif	2105	# endif
2084	else	2106	else
2085	scrollBar.state = STATE_MOTION;	2107	scrollBar.state = SB_STATE_MOTION;
2086	}	2108	}
2087	else	2109	else
2088	{	2110	{
2089	scr_page ((ev.button == Button1 ? DN : UP),	2111	scr_page ((ev.button == Button1 ? DN : UP),
2090	(nrow	2112	(nrow
2091	* scrollbar_position (ev.y)	2113	* scrollBar.position (ev.y)
2092	/ scrollBar.size ()));	2114	/ scrollBar.size ()));
2093	}	2115	}
2094		2116
2095	break;	2117	break;
2096	}	2118	}
…		…
2107		2129
2108	csrO = 0; /* reset csr Offset */	2130	csrO = 0; /* reset csr Offset */
2109	if (!bypass_keystate)	2131	if (!bypass_keystate)
2110	reportmode = !! (priv_modes & PrivMode_mouse_report);	2132	reportmode = !! (priv_modes & PrivMode_mouse_report);
2111		2133
2112	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2134	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2113	{	2135	{
2114	scrollBar.state = STATE_IDLE;	2136	scrollBar.state = SB_STATE_IDLE;
2115	scrollBar.show (0);	2137	scrollBar.show (0);
2116	}	2138	}
2117		2139
2118	#ifdef SELECTION_SCROLLING	2140	#ifdef SELECTION_SCROLLING
2119	sel_scroll_ev.stop();	2141	sel_scroll_ev.stop();
…		…
2169	case Button3:	2191	case Button3:
2170	selection_make (ev.time);	2192	selection_make (ev.time);
2171	break;	2193	break;
2172		2194
2173	case Button2:	2195	case Button2:
2174	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?
2175	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2197	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176	break;	2198	break;
2177		2199
2178	#ifdef MOUSE_WHEEL	2200	#ifdef MOUSE_WHEEL
2179	case Button4:	2201	case Button4:
…		…
2214	}	2236	}
2215	}	2237	}
2216		2238
2217	/}}} /	2239	/}}} /
2218		2240
2219	void	2241	void ecb_hot
2220	rxvt_term::cmd_parse ()	2242	rxvt_term::cmd_parse ()
2221	{	2243	{
2222	wchar_t ch = NOCHAR;	2244	wchar_t ch = NOCHAR;
2223	char *seq_begin; // remember start of esc-sequence here	2245	char *seq_begin; // remember start of esc-sequence here
2224		2246
2225	for (;;)	2247	for (;;)
2226	{	2248	{
2227	if (expect_false (ch == NOCHAR))	2249	if (ecb_unlikely (ch == NOCHAR))
2228	{	2250	{
2229	seq_begin = cmdbuf_ptr;	2251	seq_begin = cmdbuf_ptr;
2230	ch = next_char ();	2252	ch = next_char ();
2231		2253
2232	if (ch == NOCHAR)	2254	if (ch == NOCHAR)
2233	break;	2255	break;
2234	}	2256	}
2235		2257
2236	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))
2237	{	2259	{
2238	if (expect_false (!seen_input))	2260	if (ecb_unlikely (!seen_input))
2239	{	2261	{
2240	seen_input = 1;	2262	seen_input = 1;
2241	// many badly-written programs (e.g. jed) contain a race condition:	2263	// many badly-written programs (e.g. jed) contain a race condition:
2242	// they first read the screensize and then install a SIGWINCH handler.	2264	// they first read the screensize and then install a SIGWINCH handler.
2243	// some window managers resize the window early, and these programs	2265	// some window managers resize the window early, and these programs
…		…
2256	wchar_t *str = buf;	2278	wchar_t *str = buf;
2257	wchar_t *eol = str + min (ncol, UBUFSIZ);	2279	wchar_t *eol = str + min (ncol, UBUFSIZ);
2258		2280
2259	for (;;)	2281	for (;;)
2260	{	2282	{
2261	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)))
2262	break;	2284	break;
2263		2285
2264	*str++ = ch;	2286	*str++ = ch;
2265		2287
2266	if (expect_false (ch == C0_LF \|\| str >= eol))	2288	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2267	{	2289	{
2268	if (ch == C0_LF)	2290	if (ch == C0_LF)
2269	nlines++;	2291	nlines++;
2270		2292
2271	refresh_count++;	2293	refresh_count++;
…		…
2343	}	2365	}
2344	}	2366	}
2345	}	2367	}
2346		2368
2347	// read the next character	2369	// read the next character
2348	wchar_t	2370	wchar_t ecb_hot
2349	rxvt_term::next_char () NOTHROW	2371	rxvt_term::next_char () NOTHROW
2350	{	2372	{
2351	while (cmdbuf_ptr < cmdbuf_endp)	2373	while (cmdbuf_ptr < cmdbuf_endp)
2352	{	2374	{
2353	// assume 7-bit to be ascii ALWAYS	2375	// assume 7-bit to be ascii ALWAYS
2354	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2376	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2355	return *cmdbuf_ptr++;	2377	return *cmdbuf_ptr++;
2356		2378
2357	wchar_t wc;	2379	wchar_t wc;
2358	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);
2359		2381
…		…
2377		2399
2378	return NOCHAR;	2400	return NOCHAR;
2379	}	2401	}
2380		2402
2381	// read the next octet	2403	// read the next octet
2382	uint32_t	2404	uint32_t ecb_hot
2383	rxvt_term::next_octet () NOTHROW	2405	rxvt_term::next_octet () NOTHROW
2384	{	2406	{
2385	return cmdbuf_ptr < cmdbuf_endp	2407	return cmdbuf_ptr < cmdbuf_endp
2386	? (unsigned char)*cmdbuf_ptr++	2408	? (unsigned char)*cmdbuf_ptr++
2387	: NOCHAR;	2409	: NOCHAR;
2388	}	2410	}
2389		2411
2390	static class out_of_input out_of_input;	2412	static class out_of_input out_of_input;
2391		2413
2392	wchar_t	2414	wchar_t ecb_hot
2393	rxvt_term::cmd_getc () THROW ((class out_of_input))	2415	rxvt_term::cmd_getc () THROW ((class out_of_input))
2394	{	2416	{
2395	wchar_t c = next_char ();	2417	wchar_t c = next_char ();
2396		2418
2397	if (c == NOCHAR)	2419	if (c == NOCHAR)
2398	throw out_of_input;	2420	throw out_of_input;
2399		2421
2400	return c;	2422	return c;
2401	}	2423	}
2402		2424
2403	uint32_t	2425	uint32_t ecb_hot
2404	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2426	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405	{	2427	{
2406	uint32_t c = next_octet ();	2428	uint32_t c = next_octet ();
2407		2429
2408	if (c == NOCHAR)	2430	if (c == NOCHAR)
…		…
2412	}	2434	}
2413		2435
2414	/{{{ print pipe /	2436	/{{{ print pipe /
2415	/----------------------------------------------------------------------/	2437	/----------------------------------------------------------------------/
2416	#ifdef PRINTPIPE	2438	#ifdef PRINTPIPE
2417	FILE *	2439	FILE * ecb_cold
2418	rxvt_term::popen_printer ()	2440	rxvt_term::popen_printer ()
2419	{	2441	{
2420	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2442	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421		2443
2422	if (stream == NULL)	2444	if (stream == NULL)
2423	rxvt_warn ("can't open printer pipe, not printing.\n");	2445	rxvt_warn ("can't open printer pipe, not printing.\n");
2424		2446
2425	return stream;	2447	return stream;
2426	}	2448	}
2427		2449
2428	int	2450	int ecb_cold
2429	rxvt_term::pclose_printer (FILE *stream)	2451	rxvt_term::pclose_printer (FILE *stream)
2430	{	2452	{
2431	fflush (stream);	2453	fflush (stream);
2432	return pclose (stream);	2454	return pclose (stream);
2433	}	2455	}
2434		2456
2435	/*	2457	/*
2436	* simulate attached vt100 printer	2458	* simulate attached vt100 printer
2437	*/	2459	*/
2438	void	2460	void ecb_cold
2439	rxvt_term::process_print_pipe ()	2461	rxvt_term::process_print_pipe ()
2440	{	2462	{
2441	FILE *fd = popen_printer ();	2463	FILE *fd = popen_printer ();
2442		2464
2443	if (!fd)	2465	if (!fd)
…		…
2498	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2520	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2521	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500	};	2522	};
2501		2523
2502	/{{{ process non-printing single characters /	2524	/{{{ process non-printing single characters /
2503	void	2525	void ecb_hot
2504	rxvt_term::process_nonprinting (unicode_t ch)	2526	rxvt_term::process_nonprinting (unicode_t ch)
2505	{	2527	{
2506	switch (ch)	2528	switch (ch)
2507	{	2529	{
2508	case C0_ESC:	2530	case C0_ESC:
…		…
2554	}	2576	}
2555	/}}} /	2577	/}}} /
2556		2578
2557		2579
2558	/{{{ process VT52 escape sequences /	2580	/{{{ process VT52 escape sequences /
2559	void	2581	void ecb_cold
2560	rxvt_term::process_escape_vt52 (unicode_t ch)	2582	rxvt_term::process_escape_vt52 (unicode_t ch)
2561	{	2583	{
2562	int row, col;	2584	int row, col;
2563		2585
2564	switch (ch)	2586	switch (ch)
…		…
2598	break;	2620	break;
2599	case 'Z': /* identify the terminal type */	2621	case 'Z': /* identify the terminal type */
2600	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2622	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601	break;	2623	break;
2602	case '<': /* turn off VT52 mode */	2624	case '<': /* turn off VT52 mode */
2603	set_privmode (PrivMode_vt52, 0);	2625	priv_modes &= ~PrivMode_vt52;
2604	break;	2626	break;
2605	case 'F': /* use special graphics character set */	2627	case 'F': /* use special graphics character set */
2606	case 'G': /* use regular character set */	2628	case 'G': /* use regular character set */
2607	/* unimplemented */	2629	/* unimplemented */
2608	break;	2630	break;
…		…
2614	}	2636	}
2615	/}}} /	2637	/}}} /
2616		2638
2617		2639
2618	/{{{ process escape sequences /	2640	/{{{ process escape sequences /
2619	void	2641	void ecb_hot
2620	rxvt_term::process_escape_seq ()	2642	rxvt_term::process_escape_seq ()
2621	{	2643	{
2622	unicode_t ch = cmd_getc ();	2644	unicode_t ch = cmd_getc ();
2623		2645
2624	if (priv_modes & PrivMode_vt52)	2646	if (priv_modes & PrivMode_vt52)
…		…
2627	return;	2649	return;
2628	}	2650	}
2629		2651
2630	switch (ch)	2652	switch (ch)
2631	{	2653	{
2632	/* case 1: do_tek_mode (); break; */
2633	case '#':	2654	case '#':
2634	if (cmd_getc () == '8')	2655	if (cmd_getc () == '8')
2635	scr_E ();	2656	scr_E ();
2636	break;	2657	break;
2637	case '(':	2658	case '(':
…		…
2660	#if !ENABLE_MINIMAL	2681	#if !ENABLE_MINIMAL
2661	case '9':	2682	case '9':
2662	scr_forwardindex ();	2683	scr_forwardindex ();
2663	break;	2684	break;
2664	#endif	2685	#endif
		2686	// DECPAM/DECPNM
2665	case '=':	2687	case '=':
		2688	priv_modes \|= PrivMode_aplKP;
		2689	break;
2666	case '>':	2690	case '>':
2667	set_privmode (PrivMode_aplKP, ch == '=');	2691	priv_modes &= ~PrivMode_aplKP;
2668	break;	2692	break;
2669		2693
2670	case C1_40:	2694	case C1_40:
2671	cmd_getc ();	2695	cmd_getc ();
2672	break;	2696	break;
…		…
2676		2700
2677	/* 8.3.87: NEXT LINE */	2701	/* 8.3.87: NEXT LINE */
2678	case C1_NEL: /* ESC E */	2702	case C1_NEL: /* ESC E */
2679	{	2703	{
2680	wchar_t nlcr[] = { C0_LF, C0_CR };	2704	wchar_t nlcr[] = { C0_LF, C0_CR };
2681	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2705	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682	}	2706	}
2683	break;	2707	break;
2684		2708
2685	/* kidnapped escape sequence: Should be 8.3.48 */	2709	/* kidnapped escape sequence: Should be 8.3.48 */
2686	case C1_ESA: /* ESC G */	2710	case C1_ESA: /* ESC G */
…		…
2698	case C1_RI: /* ESC M */	2722	case C1_RI: /* ESC M */
2699	scr_index (DN);	2723	scr_index (DN);
2700	break;	2724	break;
2701		2725
2702	/* 8.3.142: SINGLE-SHIFT TWO */	2726	/* 8.3.142: SINGLE-SHIFT TWO */
2703	/case C1_SS2: scr_single_shift (2); break; /	2727	/* case C1_SS2: break; */
2704		2728
2705	/* 8.3.143: SINGLE-SHIFT THREE */	2729	/* 8.3.143: SINGLE-SHIFT THREE */
2706	/case C1_SS3: scr_single_shift (3); break; /	2730	/* case C1_SS3: break; */
2707		2731
2708	/* 8.3.27: DEVICE CONTROL STRING */	2732	/* 8.3.27: DEVICE CONTROL STRING */
2709	case C1_DCS: /* ESC P */	2733	case C1_DCS: /* ESC P */
2710	process_dcs_seq ();	2734	process_dcs_seq ();
2711	break;	2735	break;
…		…
2774	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2798	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2799	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2800	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2777	};	2801	};
2778		2802
2779	void	2803	void ecb_hot
2780	rxvt_term::process_csi_seq ()	2804	rxvt_term::process_csi_seq ()
2781	{	2805	{
2782	unicode_t ch, priv, i;	2806	unicode_t ch, priv, i;
2783	unsigned int nargs, p;	2807	unsigned int nargs, p;
2784	int n, ndef;	2808	int n, ndef;
…		…
2862	scr_soft_reset ();	2886	scr_soft_reset ();
2863		2887
2864	static const int pm_h[] = { 7, 25 };	2888	static const int pm_h[] = { 7, 25 };
2865	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2889	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866		2890
2867	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2891	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2892	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869	}	2893	}
2870	break;	2894	break;
2871	}	2895	}
2872		2896
2873	return;	2897	return;
…		…
2891	}	2915	}
2892	break;	2916	break;
2893	#endif	2917	#endif
2894		2918
2895	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2898	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2899	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2902	break;	2926	break;
2903		2927
2904	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3138	break;	3162	break;
3139		3163
3140	//case 9: NYI, TODO, restore maximized window or maximize window	3164	//case 9: NYI, TODO, restore maximized window or maximize window
3141	default:	3165	default:
3142	if (args[0] >= 24) /* set height (chars) */	3166	if (args[0] >= 24) /* set height (chars) */
3143	set_widthheight ((unsigned int)width,	3167	set_widthheight ((unsigned int)vt_width,
3144	(unsigned int) (args[1] * fheight));	3168	(unsigned int) (args[1] * fheight));
3145	break;	3169	break;
3146		3170
3147	/*	3171	/*
3148	* reports - some output format copied from XTerm	3172	* reports - some output format copied from XTerm
…		…
3434	process_color_seq (op, Color_tint, str, resp);	3458	process_color_seq (op, Color_tint, str, resp);
3435	{	3459	{
3436	bool changed = false;	3460	bool changed = false;
3437		3461
3438	if (ISSET_PIXCOLOR (Color_tint))	3462	if (ISSET_PIXCOLOR (Color_tint))
3439	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3463	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3440		3464
3441	if (changed)	3465	if (changed)
3442	update_background ();	3466	update_background ();
3443	}	3467	}
3444		3468
…		…
3448	#if BG_IMAGE_FROM_FILE	3472	#if BG_IMAGE_FROM_FILE
3449	case Rxvt_Pixmap:	3473	case Rxvt_Pixmap:
3450	if (!strcmp (str, "?"))	3474	if (!strcmp (str, "?"))
3451	{	3475	{
3452	char str[256];	3476	char str[256];
		3477	int h_scale = fimage.h_scale;
		3478	int v_scale = fimage.v_scale;
		3479	int h_align = fimage.h_align;
		3480	int v_align = fimage.v_align;
3453		3481
3454	sprintf (str, "[%dx%d+%d+%d]",	3482	sprintf (str, "[%dx%d+%d+%d]",
3455	min (h_scale, 32767), min (v_scale, 32767),	3483	h_scale, v_scale,
3456	min (h_align, 32767), min (v_align, 32767));	3484	h_align, v_align);
3457	process_xterm_seq (XTerm_title, str, CHAR_ST);	3485	process_xterm_seq (XTerm_title, str, CHAR_ST);
3458	}	3486	}
3459	else	3487	else
3460	{	3488	{
3461	int changed = 0;	3489	bool changed = false;
3462		3490
3463	if (*str != ';')	3491	if (*str != ';')
3464	{	3492	{
3465	if (bg_set_file (str)) /* change pixmap */	3493	if (fimage.set_file_geometry (this, str))
3466	{
3467	changed++;	3494	changed = true;
3468	str = strchr (str, ';');
3469	if (str == NULL)
3470	bg_set_default_geometry ();
3471	else
3472	bg_set_geometry (str+1);
3473	}
3474	}	3495	}
3475	else	3496	else
3476	{	3497	{
3477	str++;	3498	str++;
3478	if (bg_set_geometry (str, true))	3499	if (fimage.set_geometry (str, true))
3479	changed++;	3500	changed = true;
3480	}	3501	}
3481		3502
3482	if (changed)	3503	if (changed)
3483	{	3504	{
3484	if (bg_window_position_sensitive ())	3505	if (bg_window_position_sensitive ())
3485	{	3506	{
3486	int x, y;	3507	int x, y;
3487	get_window_origin (x, y);	3508	get_window_origin (x, y);
3488	bg_set_position (x, y);	3509	parent_x = x;
		3510	parent_y = y;
3489	}	3511	}
3490	update_background ();	3512	update_background ();
3491	}	3513	}
3492	}	3514	}
3493	break;	3515	break;
…		…
3583	* 's' = save	3605	* 's' = save
3584	* 'r' = restore	3606	* 'r' = restore
3585	* 't' = toggle	3607	* 't' = toggle
3586	* so no need for fancy checking	3608	* so no need for fancy checking
3587	*/	3609	*/
3588	int	3610	int ecb_cold
3589	rxvt_term::privcases (int mode, unsigned long bit)	3611	rxvt_term::privcases (int mode, unsigned long bit)
3590	{	3612	{
3591	int state;	3613	int state;
3592		3614
3593	if (mode == 's')	3615	if (mode == 's')
3594	{	3616	{
3595	SavedModes \|= (priv_modes & bit);	3617	if (priv_modes & bit)
		3618	SavedModes \|= bit;
		3619	else
		3620	SavedModes &= ~bit;
3596	return -1;	3621	return -1;
3597	}	3622	}
3598	else	3623	else
3599	{	3624	{
3600	if (mode == 'r')	3625	if (mode == 'r')
3601	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3626	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602	else	3627	else
3603	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3628	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604		3629
3605	set_privmode (bit, state);	3630	if (state)
		3631	priv_modes \|= bit;
		3632	else
		3633	priv_modes &= ~bit;
3606	}	3634	}
3607		3635
3608	return state;	3636	return state;
3609	}	3637	}
3610		3638
3611	/* we're not using priv _yet_ */	3639	/* we're not using priv _yet_ */
3612	void	3640	void
3613	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3641	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614	{	3642	{
3615	unsigned int i, j;	3643	unsigned int i, j;
3616	int state;	3644	int state;
3617		3645
3618	static const struct	3646	static const struct
3619	{	3647	{
3620	const int argval;	3648	const int argval;
3621	const unsigned long bit;	3649	const unsigned long bit;
3622	} argtopriv[] = {	3650	} argtopriv[] = {
3623	{ 1, PrivMode_aplCUR }, // DECCKM	3651	{ 1, PrivMode_aplCUR }, // DECCKM
3624	{ 2, PrivMode_vt52 },	3652	{ 2, PrivMode_vt52 }, // DECANM
3625	{ 3, PrivMode_132 }, // DECCOLM	3653	{ 3, PrivMode_132 }, // DECCOLM
3626	{ 4, PrivMode_smoothScroll }, // DECSCLM	3654	{ 4, PrivMode_smoothScroll }, // DECSCLM
3627	{ 5, PrivMode_rVideo }, // DECSCNM	3655	{ 5, PrivMode_rVideo }, // DECSCNM
3628	{ 6, PrivMode_relOrigin }, // DECOM	3656	{ 6, PrivMode_relOrigin }, // DECOM
3629	{ 7, PrivMode_Autowrap }, // DECAWM	3657	{ 7, PrivMode_Autowrap }, // DECAWM
3630	// 8, auto-repeat keys // DECARM	3658	// 8, auto-repeat keys // DECARM
3631	{ 9, PrivMode_MouseX10 },	3659	{ 9, PrivMode_MouseX10 },
3632	// 18 end FF to printer after print screen	3660	// 18 end FF to printer after print screen
3633	// 19 Print screen prints full screen/scroll region	3661	// 19 Print screen prints full screen/scroll region
3634	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3662	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635	#ifdef scrollBar_esc	3663	#ifdef scrollBar_esc
3636	{ scrollBar_esc, PrivMode_scrollBar },	3664	{ scrollBar_esc, PrivMode_scrollBar },
3637	#endif	3665	#endif
3638	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3666	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3639	// 38, tektronix mode // DECTEK	3667	// 38, tektronix mode // DECTEK
3640	{ 40, PrivMode_132OK },	3668	{ 40, PrivMode_132OK },
3641	// 41 xterm more fixes NYI	3669	// 41 xterm more fixes NYI
3642	// 45 margin bell NYI	3670	// 45 margin bell NYI
3643	// 46 start logging	3671	// 46 start logging
3644	{ 47, PrivMode_Screen },	3672	{ 47, PrivMode_Screen },
3645	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3673	{ 66, PrivMode_aplKP }, // DECNKM
3646	#ifndef NO_BACKSPACE_KEY	3674	#ifndef NO_BACKSPACE_KEY
3647	{ 67, PrivMode_BackSpace }, // DECBKM	3675	{ 67, PrivMode_BackSpace }, // DECBKM
3648	#endif	3676	#endif
3649	{ 1000, PrivMode_MouseX11 },	3677	{ 1000, PrivMode_MouseX11 },
3650	{ 1002, PrivMode_MouseBtnEvent },	3678	{ 1002, PrivMode_MouseBtnEvent },
…		…
3679	for (i = 0; i < nargs; i++)	3707	for (i = 0; i < nargs; i++)
3680	{	3708	{
3681	state = -1;	3709	state = -1;
3682		3710
3683	/* basic handling */	3711	/* basic handling */
3684	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3712	for (j = 0; j < ecb_array_length (argtopriv); j++)
3685	if (argtopriv[j].argval == arg[i])	3713	if (argtopriv[j].argval == arg[i])
3686	{	3714	{
3687	state = privcases (mode, argtopriv[j].bit);	3715	state = privcases (mode, argtopriv[j].bit);
3688	break;	3716	break;
3689	}	3717	}
…		…
3715	case 2: /* VT52 mode */	3743	case 2: /* VT52 mode */
3716	/* oddball mode. should be set regardless of set/reset	3744	/* oddball mode. should be set regardless of set/reset
3717	* parameter. Return from VT52 mode with an ESC < from	3745	* parameter. Return from VT52 mode with an ESC < from
3718	* within VT52 mode	3746	* within VT52 mode
3719	*/	3747	*/
3720	set_privmode (PrivMode_vt52, 1);	3748	priv_modes \|= PrivMode_vt52;
3721	break;	3749	break;
3722	case 3: /* 80/132 */	3750	case 3: /* 80/132 */
3723	if (priv_modes & PrivMode_132OK)	3751	if (priv_modes & PrivMode_132OK)
3724	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3752	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725	break;	3753	break;
…		…
3740	if (state) /* orthogonal */	3768	if (state) /* orthogonal */
3741	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3769	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3742	break;	3770	break;
3743	#ifdef scrollBar_esc	3771	#ifdef scrollBar_esc
3744	case scrollBar_esc:	3772	case scrollBar_esc:
3745	if (scrollBar.map (state))	3773	scrollBar.map (state);
3746	{
3747	resize_all_windows (0, 0, 0);	3774	resize_all_windows (0, 0, 0);
3748	scr_touch (true);	3775	scr_touch (true);
3749	}
3750	break;	3776	break;
3751	#endif	3777	#endif
3752	case 25: /* visible/invisible cursor */	3778	case 25: /* visible/invisible cursor */
3753	scr_cursor_visible (state);	3779	scr_cursor_visible (state);
3754	break;	3780	break;
…		…
3809	}	3835	}
3810	}	3836	}
3811	/}}} /	3837	/}}} /
3812		3838
3813	/{{{ process sgr sequences /	3839	/{{{ process sgr sequences /
3814	void	3840	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3841	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3842	{
3817	unsigned int i;	3843	unsigned int i;
3818	short rendset;	3844	short rendset;
3819	int rendstyle;	3845	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs. Revision 1.521 by sf-exg, Sun Jun 10 16:00:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.521 by sf-exg, Sun Jun 10 16:00:26 2012 UTC