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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.517 by root, Wed Jun 6 08:59:13 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
…		…
569	selection_request (ev.time);	570	selection_request (ev.time);
570	return;	571	return;
571	#if TODO	572	#if TODO
572	/* rxvt extras */	573	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	574	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	575	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	577	return;
579	#endif	578	#endif
580	}	579	}
581	}	580	}
582	}	581	}
…		…
781	}	780	}
782		781
783	if (newlen)	782	if (newlen)
784	len = strlen (kbuf);	783	len = strlen (kbuf);
785		784
		785	if (len > 0)
		786	{
786	/*	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	/*
787	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
788	*/	801	*/
789	#ifdef META8_OPTION	802	#ifdef META8_OPTION
790	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
791	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
792	#endif	805	#endif
		806	}
793		807
794	}	808	}
795	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
796	{	810	{
797	len = 1;	811	len = 1;
…		…
831	{	845	{
832	view_start = 0;	846	view_start = 0;
833	want_refresh = 1;	847	want_refresh = 1;
834	}	848	}
835		849
836	/*
837	* these modifications only affect the static keybuffer
838	* pass Shift/Control indicators for function keys ending with `~'
839	*
840	* eg,
841	* Prior = "ESC[5~"
842	* Shift+Prior = "ESC[5$"
843	* Ctrl+Prior = "ESC[5^"
844	* Ctrl+Shift+Prior = "ESC[5@"
845	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846	*/
847	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850	/* escape prefix */	850	/* escape prefix */
851	if (meta	851	if (meta
852	#ifdef META8_OPTION	852	#ifdef META8_OPTION
853	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
854	#endif	854	#endif
…		…
859	}	859	}
860		860
861	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
862	}	862	}
863		863
864	void	864	void ecb_cold
865	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
866	{	866	{
867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
868	KeySym keysym;	868	KeySym keysym;
869		869
…		…
991	while (row < end_row);	991	while (row < end_row);
992	}	992	}
993		993
994	scr_refresh ();	994	scr_refresh ();
995	scrollBar.show (1);	995	scrollBar.show (1);
996	#ifdef USE_XIM	996	#if USE_XIM
997	IMSendSpot ();	997	im_send_spot ();
998	#endif	998	#endif
999	}	999	}
1000		1000
1001	display->flush ();	1001	display->flush ();
1002	}	1002	}
…		…
1020	flush ();	1020	flush ();
1021	}	1021	}
1022		1022
1023	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1024	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
1025	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026	{	1041	{
1027	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1028	want_refresh = 1;	1043	want_refresh = 1;
1029	refresh_check ();	1044	refresh_check ();
…		…
1047		1062
1048	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049	void	1064	void
1050	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051	{	1066	{
1052	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1053	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054	{	1069	{
1055	want_refresh = 1;	1070	want_refresh = 1;
1056	refresh_check ();	1071	refresh_check ();
1057	}	1072	}
1058	else	1073	else
…		…
1208	pty_write ();	1223	pty_write ();
1209		1224
1210	refresh_check ();	1225	refresh_check ();
1211	}	1226	}
1212		1227
1213	void	1228	void ecb_cold
1214	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1215	{	1230	{
1216	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1217	recolour_cursor ();	1232	recolour_cursor ();
1218		1233
…		…
1223	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1224	#endif	1239	#endif
1225	}	1240	}
1226		1241
1227	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1228	void	1243	void ecb_cold
1229	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1230	{	1245	{
1231	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1232	return;	1247	return;
1233		1248
…		…
1235	XFlush (dpy);	1250	XFlush (dpy);
1236		1251
1237	hidden_pointer = 1;	1252	hidden_pointer = 1;
1238	}	1253	}
1239		1254
1240	void	1255	void ecb_cold
1241	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1242	{	1257	{
1243	make_current ();	1258	make_current ();
1244		1259
1245	pointer_blank ();	1260	pointer_blank ();
…		…
1337	32 + x,	1352	32 + x,
1338	32 + y);	1353	32 + y);
1339	}	1354	}
1340		1355
1341	/{{{ process an X event /	1356	/{{{ process an X event /
1342	void	1357	void ecb_hot
1343	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1344	{	1359	{
1345	make_current ();	1360	make_current ();
1346		1361
1347	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1450	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1451	{	1466	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1468	;
1454		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
1455	#ifdef HAVE_BG_PIXMAP	1472	#ifdef HAVE_BG_PIXMAP
		1473	if (bg_window_position_sensitive ())
		1474	want_position_change = true;
		1475	#endif
		1476
1456	bool moved = false;	1477	bool moved = false;
1457	if (bg_window_position_sensitive ())	1478
		1479	if (want_position_change)
1458	{	1480	{
1459	int x, y;	1481	int x, y;
		1482
1460	if (ev.xconfigure.send_event)	1483	if (ev.xconfigure.send_event)
1461	{	1484	{
1462	x = ev.xconfigure.x;	1485	x = ev.xconfigure.x;
1463	y = ev.xconfigure.y;	1486	y = ev.xconfigure.y;
1464	}	1487	}
1465	else	1488	else
1466	get_window_origin (x, y);	1489	get_window_origin (x, y);
1467		1490
		1491	if (x != parent_x \|\| y != parent_y)
		1492	{
		1493	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1494	parent_x = x;
		1495	parent_y = y;
		1496	}
		1497
1468	if (bg_set_position (x, y)	1498	if (bg_set_position (x, y)
1469	\|\| !(bg_flags & BG_IS_VALID))	1499	\|\| !(bg_flags & BG_IS_VALID))
1470	moved = true;	1500	moved = true;
1471	}	1501	}
1472	#endif
1473		1502
1474	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1475	{	1504	{
1476	seen_resize = 1;	1505	seen_resize = 1;
1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478	}	1507	}
1479	else	1508	else
1480	{	1509	{
1481	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1482	if (moved)	1511	if (moved)
1483	{
1484	if (mapped)
1485	update_background ();	1512	update_background ();
1486	else
1487	bg_invalidate ();
1488	}
1489	#endif	1513	#endif
1490	}	1514	}
1491		1515
1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493	}	1517	}
…		…
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1591	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568	;	1592	;
1569		1593
1570	if (scrollBar.state && ev.xany.window == scrollBar.win)	1594	if (scrollBar.state && ev.xany.window == scrollBar.win)
1571	{	1595	{
1572	scrollBar.state = STATE_IDLE;	1596	scrollBar.state = SB_STATE_IDLE;
1573	scrollBar.show (0);	1597	scrollBar.show (0);
1574	}	1598	}
1575	}	1599	}
1576	break;	1600	break;
1577		1601
…		…
1643	dist = int_bwidth - ev.xbutton.y;	1667	dist = int_bwidth - ev.xbutton.y;
1644	}	1668	}
1645	else	1669	else
1646	{	1670	{
1647	scroll_selection_dir = DN;	1671	scroll_selection_dir = DN;
1648	dist = ev.xbutton.y - (int_bwidth + height);	1672	dist = ev.xbutton.y - (int_bwidth + vt_height);
1649	}	1673	}
1650		1674
1651	scroll_selection_lines = Pixel2Height (dist)	1675	scroll_selection_lines = Pixel2Height (dist)
1652	/ SELECTION_SCROLL_LINE_SPEEDUP	1676	/ SELECTION_SCROLL_LINE_SPEEDUP
1653	+ 1;	1677	+ 1;
…		…
1665	#ifdef MOUSE_THRESHOLD	1689	#ifdef MOUSE_THRESHOLD
1666	}	1690	}
1667	#endif	1691	#endif
1668	}	1692	}
1669	}	1693	}
1670	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1694	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671	{	1695	{
1672	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1696	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673	MotionNotify, &ev))	1697	MotionNotify, &ev))
1674	;	1698	;
1675		1699
1676	XQueryPointer (dpy, scrollBar.win,	1700	XQueryPointer (dpy, scrollBar.win,
1677	&unused_root, &unused_child,	1701	&unused_root, &unused_child,
1678	&unused_root_x, &unused_root_y,	1702	&unused_root_x, &unused_root_y,
1679	&ev.xbutton.x, &ev.xbutton.y,	1703	&ev.xbutton.x, &ev.xbutton.y,
1680	&unused_mask);	1704	&unused_mask);
1681	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1705	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682	scrollBar.size ());	1706	scrollBar.size ());
1683	want_refresh = 1;	1707	want_refresh = 1;
1684	scrollBar.show (1);	1708	scrollBar.show (1);
1685	}	1709	}
1686	break;	1710	break;
1687	}	1711	}
1688		1712
1689	#if defined(CURSOR_BLINK)	1713	#if defined(CURSOR_BLINK)
1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1714	if (ev.type == KeyPress)
1691	{
1692	if (hidden_cursor)
1693	{
1694	hidden_cursor = 0;
1695	want_refresh = 1;
1696	}
1697
1698	cursor_blink_ev.again ();	1715	cursor_blink_reset ();
1699	}
1700	#endif	1716	#endif
1701		1717
1702	#if defined(POINTER_BLANK)	1718	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1719	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704	{	1720	{
…		…
1715		1731
1716	refresh_check ();	1732	refresh_check ();
1717	}	1733	}
1718		1734
1719	#if ENABLE_FRILLS	1735	#if ENABLE_FRILLS
1720	void	1736	void ecb_cold
1721	rxvt_term::set_urgency (bool enable)	1737	rxvt_term::set_urgency (bool enable)
1722	{	1738	{
1723	if (enable == urgency_hint)	1739	if (enable == urgency_hint)
1724	return;	1740	return;
1725		1741
1726	if (XWMHints *h = XGetWMHints (dpy, parent))	1742	if (XWMHints *h = XGetWMHints (dpy, parent))
1727	{	1743	{
1728	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1744	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1729	XSetWMHints (dpy, parent, h);	1745	XSetWMHints (dpy, parent, h);
1730	urgency_hint = enable;	1746	urgency_hint = enable;
		1747	XFree (h);
1731	}	1748	}
1732	}	1749	}
1733	#endif	1750	#endif
1734		1751
1735	void	1752	void ecb_cold
1736	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1737	{	1754	{
1738	if (!focus)	1755	if (!focus)
1739	{	1756	{
1740	focus = 1;	1757	focus = 1;
1741	want_refresh = 1;	1758	want_refresh = 1;
1742		1759
1743	#if USE_XIM	1760	#if USE_XIM
1744	if (Input_Context != NULL)	1761	if (Input_Context != NULL)
1745	{	1762	{
1746	IMSetPosition ();	1763	im_set_position ();
1747	XSetICFocus (Input_Context);	1764	XSetICFocus (Input_Context);
1748	}	1765	}
1749	#endif	1766	#endif
1750	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1751	if (option (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
…		…
1765		1782
1766	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1783	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767	}	1784	}
1768	}	1785	}
1769		1786
1770	void	1787	void ecb_cold
1771	rxvt_term::focus_out ()	1788	rxvt_term::focus_out ()
1772	{	1789	{
1773	if (focus)	1790	if (focus)
1774	{	1791	{
1775	focus = 0;	1792	focus = 0;
…		…
1808		1825
1809	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1826	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810	}	1827	}
1811	}	1828	}
1812		1829
1813	void	1830	void ecb_cold
1814	rxvt_term::update_fade_color (unsigned int idx)	1831	rxvt_term::update_fade_color (unsigned int idx)
1815	{	1832	{
1816	#if OFF_FOCUS_FADING	1833	#if OFF_FOCUS_FADING
1817	if (rs[Rs_fade])	1834	if (rs[Rs_fade])
1818	{	1835	{
…		…
1822	}	1839	}
1823	#endif	1840	#endif
1824	}	1841	}
1825		1842
1826	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1843	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1827	void	1844	void ecb_hot
1828	rxvt_term::rootwin_cb (XEvent &ev)	1845	rxvt_term::rootwin_cb (XEvent &ev)
1829	{	1846	{
1830	make_current ();	1847	make_current ();
1831		1848
1832	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1849	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1850	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834	return;	1851	return;
1835		1852
1836	# if ENABLE_TRANSPARENCY
1837	switch (ev.type)	1853	switch (ev.type)
1838	{	1854	{
1839	case PropertyNotify:	1855	case PropertyNotify:
1840	/*	1856	/*
1841	* 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,
1842	* 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.
1843	*/	1859	*/
1844	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1860	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1861	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846	{	1862	{
		1863	# if ENABLE_TRANSPARENCY
1847	bg_set_root_pixmap ();	1864	bg_set_root_pixmap ();
1848	update_background ();	1865	update_background ();
		1866	#endif
		1867	#if ENABLE_PERL
		1868	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1869	#endif
1849	}	1870	}
1850		1871
1851	break;	1872	break;
1852	}	1873	}
1853	# endif
1854		1874
1855	refresh_check ();	1875	refresh_check ();
1856	}	1876	}
1857	#endif	1877	#endif
1858		1878
…		…
1982	if (scrollBar.upButton (ev.y))	2002	if (scrollBar.upButton (ev.y))
1983	direction = UP; /* up */	2003	direction = UP; /* up */
1984	else if (scrollBar.dnButton (ev.y))	2004	else if (scrollBar.dnButton (ev.y))
1985	direction = DN; /* down */	2005	direction = DN; /* down */
1986		2006
1987	scrollBar.state = STATE_IDLE;	2007	scrollBar.state = SB_STATE_IDLE;
1988	/*	2008	/*
1989	* Rxvt-style scrollbar:	2009	* Rxvt-style scrollbar:
1990	* move up if mouse is above slider	2010	* move up if mouse is above slider
1991	* move dn if mouse is below slider	2011	* move dn if mouse is below slider
1992	*	2012	*
…		…
2031	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2051	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032	#endif	2052	#endif
2033	if (scr_page (direction, 1))	2053	if (scr_page (direction, 1))
2034	{	2054	{
2035	if (direction == UP)	2055	if (direction == UP)
2036	scrollBar.state = STATE_UP;	2056	scrollBar.state = SB_STATE_UP;
2037	else	2057	else
2038	scrollBar.state = STATE_DOWN;	2058	scrollBar.state = SB_STATE_DOWN;
2039	}	2059	}
2040	}	2060	}
2041	else	2061	else
2042	switch (ev.button)	2062	switch (ev.button)
2043	{	2063	{
2044	case Button2:	2064	case Button2:
2045	switch (scrollBar.align)	2065	switch (scrollBar.align)
2046	{	2066	{
2047	case R_SB_ALIGN_TOP:	2067	case SB_ALIGN_TOP:
2048	csrO = 0;	2068	csrO = 0;
2049	break;	2069	break;
2050	case R_SB_ALIGN_CENTRE:	2070	case SB_ALIGN_CENTRE:
2051	csrO = (scrollBar.bot - scrollBar.top) / 2;	2071	csrO = (scrollBar.bot - scrollBar.top) / 2;
2052	break;	2072	break;
2053	case R_SB_ALIGN_BOTTOM:	2073	case SB_ALIGN_BOTTOM:
2054	csrO = scrollBar.bot - scrollBar.top;	2074	csrO = scrollBar.bot - scrollBar.top;
2055	break;	2075	break;
2056	}	2076	}
2057		2077
2058	if (scrollBar.style == R_SB_XTERM	2078	if (scrollBar.style == SB_STYLE_XTERM
2059	\|\| scrollbar_above_slider (ev.y)	2079	\|\| scrollBar.above_slider (ev.y)
2060	\|\| scrollbar_below_slider (ev.y))	2080	\|\| scrollBar.below_slider (ev.y))
2061	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2081	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062		2082
2063	scrollBar.state = STATE_MOTION;	2083	scrollBar.state = SB_STATE_MOTION;
2064	break;	2084	break;
2065		2085
2066	case Button1:	2086	case Button1:
2067	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2087	if (scrollBar.align == SB_ALIGN_CENTRE)
2068	csrO = ev.y - scrollBar.top;	2088	csrO = ev.y - scrollBar.top;
2069	/* FALLTHROUGH */	2089	/* FALLTHROUGH */
2070		2090
2071	case Button3:	2091	case Button3:
2072	if (scrollBar.style != R_SB_XTERM)	2092	if (scrollBar.style != SB_STYLE_XTERM)
2073	{	2093	{
2074	if (scrollbar_above_slider (ev.y))	2094	if (scrollBar.above_slider (ev.y))
2075	# ifdef RXVT_SCROLL_FULL	2095	# ifdef RXVT_SCROLL_FULL
2076	scr_page (UP, nrow - 1);	2096	scr_page (UP, nrow - 1);
2077	# else	2097	# else
2078	scr_page (UP, nrow / 4);	2098	scr_page (UP, nrow / 4);
2079	# endif	2099	# endif
2080	else if (scrollbar_below_slider (ev.y))	2100	else if (scrollBar.below_slider (ev.y))
2081	# ifdef RXVT_SCROLL_FULL	2101	# ifdef RXVT_SCROLL_FULL
2082	scr_page (DN, nrow - 1);	2102	scr_page (DN, nrow - 1);
2083	# else	2103	# else
2084	scr_page (DN, nrow / 4);	2104	scr_page (DN, nrow / 4);
2085	# endif	2105	# endif
2086	else	2106	else
2087	scrollBar.state = STATE_MOTION;	2107	scrollBar.state = SB_STATE_MOTION;
2088	}	2108	}
2089	else	2109	else
2090	{	2110	{
2091	scr_page ((ev.button == Button1 ? DN : UP),	2111	scr_page ((ev.button == Button1 ? DN : UP),
2092	(nrow	2112	(nrow
2093	* scrollbar_position (ev.y)	2113	* scrollBar.position (ev.y)
2094	/ scrollBar.size ()));	2114	/ scrollBar.size ()));
2095	}	2115	}
2096		2116
2097	break;	2117	break;
2098	}	2118	}
…		…
2109		2129
2110	csrO = 0; /* reset csr Offset */	2130	csrO = 0; /* reset csr Offset */
2111	if (!bypass_keystate)	2131	if (!bypass_keystate)
2112	reportmode = !! (priv_modes & PrivMode_mouse_report);	2132	reportmode = !! (priv_modes & PrivMode_mouse_report);
2113		2133
2114	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2134	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2115	{	2135	{
2116	scrollBar.state = STATE_IDLE;	2136	scrollBar.state = SB_STATE_IDLE;
2117	scrollBar.show (0);	2137	scrollBar.show (0);
2118	}	2138	}
2119		2139
2120	#ifdef SELECTION_SCROLLING	2140	#ifdef SELECTION_SCROLLING
2121	sel_scroll_ev.stop();	2141	sel_scroll_ev.stop();
…		…
2171	case Button3:	2191	case Button3:
2172	selection_make (ev.time);	2192	selection_make (ev.time);
2173	break;	2193	break;
2174		2194
2175	case Button2:	2195	case Button2:
2176	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?
2177	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2197	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178	break;	2198	break;
2179		2199
2180	#ifdef MOUSE_WHEEL	2200	#ifdef MOUSE_WHEEL
2181	case Button4:	2201	case Button4:
…		…
2216	}	2236	}
2217	}	2237	}
2218		2238
2219	/}}} /	2239	/}}} /
2220		2240
2221	void	2241	void ecb_hot
2222	rxvt_term::cmd_parse ()	2242	rxvt_term::cmd_parse ()
2223	{	2243	{
2224	wchar_t ch = NOCHAR;	2244	wchar_t ch = NOCHAR;
2225	char *seq_begin; // remember start of esc-sequence here	2245	char *seq_begin; // remember start of esc-sequence here
2226		2246
2227	for (;;)	2247	for (;;)
2228	{	2248	{
2229	if (expect_false (ch == NOCHAR))	2249	if (ecb_unlikely (ch == NOCHAR))
2230	{	2250	{
2231	seq_begin = cmdbuf_ptr;	2251	seq_begin = cmdbuf_ptr;
2232	ch = next_char ();	2252	ch = next_char ();
2233		2253
2234	if (ch == NOCHAR)	2254	if (ch == NOCHAR)
2235	break;	2255	break;
2236	}	2256	}
2237		2257
2238	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))
2239	{	2259	{
2240	if (expect_false (!seen_input))	2260	if (ecb_unlikely (!seen_input))
2241	{	2261	{
2242	seen_input = 1;	2262	seen_input = 1;
2243	// many badly-written programs (e.g. jed) contain a race condition:	2263	// many badly-written programs (e.g. jed) contain a race condition:
2244	// they first read the screensize and then install a SIGWINCH handler.	2264	// they first read the screensize and then install a SIGWINCH handler.
2245	// some window managers resize the window early, and these programs	2265	// some window managers resize the window early, and these programs
…		…
2258	wchar_t *str = buf;	2278	wchar_t *str = buf;
2259	wchar_t *eol = str + min (ncol, UBUFSIZ);	2279	wchar_t *eol = str + min (ncol, UBUFSIZ);
2260		2280
2261	for (;;)	2281	for (;;)
2262	{	2282	{
2263	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)))
2264	break;	2284	break;
2265		2285
2266	*str++ = ch;	2286	*str++ = ch;
2267		2287
2268	if (expect_false (ch == C0_LF \|\| str >= eol))	2288	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2269	{	2289	{
2270	if (ch == C0_LF)	2290	if (ch == C0_LF)
2271	nlines++;	2291	nlines++;
2272		2292
2273	refresh_count++;	2293	refresh_count++;
…		…
2345	}	2365	}
2346	}	2366	}
2347	}	2367	}
2348		2368
2349	// read the next character	2369	// read the next character
2350	wchar_t	2370	wchar_t ecb_hot
2351	rxvt_term::next_char () NOTHROW	2371	rxvt_term::next_char () NOTHROW
2352	{	2372	{
2353	while (cmdbuf_ptr < cmdbuf_endp)	2373	while (cmdbuf_ptr < cmdbuf_endp)
2354	{	2374	{
2355	// assume 7-bit to be ascii ALWAYS	2375	// assume 7-bit to be ascii ALWAYS
2356	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2376	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2357	return *cmdbuf_ptr++;	2377	return *cmdbuf_ptr++;
2358		2378
2359	wchar_t wc;	2379	wchar_t wc;
2360	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);
2361		2381
…		…
2379		2399
2380	return NOCHAR;	2400	return NOCHAR;
2381	}	2401	}
2382		2402
2383	// read the next octet	2403	// read the next octet
2384	uint32_t	2404	uint32_t ecb_hot
2385	rxvt_term::next_octet () NOTHROW	2405	rxvt_term::next_octet () NOTHROW
2386	{	2406	{
2387	return cmdbuf_ptr < cmdbuf_endp	2407	return cmdbuf_ptr < cmdbuf_endp
2388	? (unsigned char)*cmdbuf_ptr++	2408	? (unsigned char)*cmdbuf_ptr++
2389	: NOCHAR;	2409	: NOCHAR;
2390	}	2410	}
2391		2411
2392	static class out_of_input out_of_input;	2412	static class out_of_input out_of_input;
2393		2413
2394	wchar_t	2414	wchar_t ecb_hot
2395	rxvt_term::cmd_getc () THROW ((class out_of_input))	2415	rxvt_term::cmd_getc () THROW ((class out_of_input))
2396	{	2416	{
2397	wchar_t c = next_char ();	2417	wchar_t c = next_char ();
2398		2418
2399	if (c == NOCHAR)	2419	if (c == NOCHAR)
2400	throw out_of_input;	2420	throw out_of_input;
2401		2421
2402	return c;	2422	return c;
2403	}	2423	}
2404		2424
2405	uint32_t	2425	uint32_t ecb_hot
2406	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2426	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407	{	2427	{
2408	uint32_t c = next_octet ();	2428	uint32_t c = next_octet ();
2409		2429
2410	if (c == NOCHAR)	2430	if (c == NOCHAR)
…		…
2414	}	2434	}
2415		2435
2416	/{{{ print pipe /	2436	/{{{ print pipe /
2417	/----------------------------------------------------------------------/	2437	/----------------------------------------------------------------------/
2418	#ifdef PRINTPIPE	2438	#ifdef PRINTPIPE
2419	FILE *	2439	FILE * ecb_cold
2420	rxvt_term::popen_printer ()	2440	rxvt_term::popen_printer ()
2421	{	2441	{
2422	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");
2423		2443
2424	if (stream == NULL)	2444	if (stream == NULL)
2425	rxvt_warn ("can't open printer pipe, not printing.\n");	2445	rxvt_warn ("can't open printer pipe, not printing.\n");
2426		2446
2427	return stream;	2447	return stream;
2428	}	2448	}
2429		2449
2430	int	2450	int ecb_cold
2431	rxvt_term::pclose_printer (FILE *stream)	2451	rxvt_term::pclose_printer (FILE *stream)
2432	{	2452	{
2433	fflush (stream);	2453	fflush (stream);
2434	return pclose (stream);	2454	return pclose (stream);
2435	}	2455	}
2436		2456
2437	/*	2457	/*
2438	* simulate attached vt100 printer	2458	* simulate attached vt100 printer
2439	*/	2459	*/
2440	void	2460	void ecb_cold
2441	rxvt_term::process_print_pipe ()	2461	rxvt_term::process_print_pipe ()
2442	{	2462	{
2443	FILE *fd = popen_printer ();	2463	FILE *fd = popen_printer ();
2444		2464
2445	if (!fd)	2465	if (!fd)
…		…
2491	pclose_printer (fd);	2511	pclose_printer (fd);
2492	}	2512	}
2493	#endif /* PRINTPIPE */	2513	#endif /* PRINTPIPE */
2494	/}}} /	2514	/}}} /
2495		2515
2496	/* INDENT-OFF */
2497	enum {	2516	enum {
2498	C1_40 = 0x40,	2517	C1_40 = 0x40,
2499	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2518	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2519	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501	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,
2502	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,
2503	};	2522	};
2504	/* INDENT-ON */
2505		2523
2506	/{{{ process non-printing single characters /	2524	/{{{ process non-printing single characters /
2507	void	2525	void ecb_hot
2508	rxvt_term::process_nonprinting (unicode_t ch)	2526	rxvt_term::process_nonprinting (unicode_t ch)
2509	{	2527	{
2510	switch (ch)	2528	switch (ch)
2511	{	2529	{
2512	case C0_ESC:	2530	case C0_ESC:
…		…
2558	}	2576	}
2559	/}}} /	2577	/}}} /
2560		2578
2561		2579
2562	/{{{ process VT52 escape sequences /	2580	/{{{ process VT52 escape sequences /
2563	void	2581	void ecb_cold
2564	rxvt_term::process_escape_vt52 (unicode_t ch)	2582	rxvt_term::process_escape_vt52 (unicode_t ch)
2565	{	2583	{
2566	int row, col;	2584	int row, col;
2567		2585
2568	switch (ch)	2586	switch (ch)
…		…
2602	break;	2620	break;
2603	case 'Z': /* identify the terminal type */	2621	case 'Z': /* identify the terminal type */
2604	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2622	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605	break;	2623	break;
2606	case '<': /* turn off VT52 mode */	2624	case '<': /* turn off VT52 mode */
2607	set_privmode (PrivMode_vt52, 0);	2625	priv_modes &= ~PrivMode_vt52;
2608	break;	2626	break;
2609	case 'F': /* use special graphics character set */	2627	case 'F': /* use special graphics character set */
2610	case 'G': /* use regular character set */	2628	case 'G': /* use regular character set */
2611	/* unimplemented */	2629	/* unimplemented */
2612	break;	2630	break;
…		…
2618	}	2636	}
2619	/}}} /	2637	/}}} /
2620		2638
2621		2639
2622	/{{{ process escape sequences /	2640	/{{{ process escape sequences /
2623	void	2641	void ecb_hot
2624	rxvt_term::process_escape_seq ()	2642	rxvt_term::process_escape_seq ()
2625	{	2643	{
2626	unicode_t ch = cmd_getc ();	2644	unicode_t ch = cmd_getc ();
2627		2645
2628	if (priv_modes & PrivMode_vt52)	2646	if (priv_modes & PrivMode_vt52)
…		…
2631	return;	2649	return;
2632	}	2650	}
2633		2651
2634	switch (ch)	2652	switch (ch)
2635	{	2653	{
2636	/* case 1: do_tek_mode (); break; */
2637	case '#':	2654	case '#':
2638	if (cmd_getc () == '8')	2655	if (cmd_getc () == '8')
2639	scr_E ();	2656	scr_E ();
2640	break;	2657	break;
2641	case '(':	2658	case '(':
…		…
2664	#if !ENABLE_MINIMAL	2681	#if !ENABLE_MINIMAL
2665	case '9':	2682	case '9':
2666	scr_forwardindex ();	2683	scr_forwardindex ();
2667	break;	2684	break;
2668	#endif	2685	#endif
		2686	// DECPAM/DECPNM
2669	case '=':	2687	case '=':
		2688	priv_modes \|= PrivMode_aplKP;
		2689	break;
2670	case '>':	2690	case '>':
2671	set_privmode (PrivMode_aplKP, ch == '=');	2691	priv_modes &= ~PrivMode_aplKP;
2672	break;	2692	break;
2673		2693
2674	case C1_40:	2694	case C1_40:
2675	cmd_getc ();	2695	cmd_getc ();
2676	break;	2696	break;
…		…
2680		2700
2681	/* 8.3.87: NEXT LINE */	2701	/* 8.3.87: NEXT LINE */
2682	case C1_NEL: /* ESC E */	2702	case C1_NEL: /* ESC E */
2683	{	2703	{
2684	wchar_t nlcr[] = { C0_LF, C0_CR };	2704	wchar_t nlcr[] = { C0_LF, C0_CR };
2685	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2705	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686	}	2706	}
2687	break;	2707	break;
2688		2708
2689	/* kidnapped escape sequence: Should be 8.3.48 */	2709	/* kidnapped escape sequence: Should be 8.3.48 */
2690	case C1_ESA: /* ESC G */	2710	case C1_ESA: /* ESC G */
…		…
2702	case C1_RI: /* ESC M */	2722	case C1_RI: /* ESC M */
2703	scr_index (DN);	2723	scr_index (DN);
2704	break;	2724	break;
2705		2725
2706	/* 8.3.142: SINGLE-SHIFT TWO */	2726	/* 8.3.142: SINGLE-SHIFT TWO */
2707	/case C1_SS2: scr_single_shift (2); break; /	2727	/* case C1_SS2: break; */
2708		2728
2709	/* 8.3.143: SINGLE-SHIFT THREE */	2729	/* 8.3.143: SINGLE-SHIFT THREE */
2710	/case C1_SS3: scr_single_shift (3); break; /	2730	/* case C1_SS3: break; */
2711		2731
2712	/* 8.3.27: DEVICE CONTROL STRING */	2732	/* 8.3.27: DEVICE CONTROL STRING */
2713	case C1_DCS: /* ESC P */	2733	case C1_DCS: /* ESC P */
2714	process_dcs_seq ();	2734	process_dcs_seq ();
2715	break;	2735	break;
…		…
2748	}	2768	}
2749	}	2769	}
2750	/}}} /	2770	/}}} /
2751		2771
2752	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2772	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2753	/* INDENT-OFF */
2754	enum {	2773	enum {
2755	CSI_ICH = 0x40,	2774	CSI_ICH = 0x40,
2756	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2775	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2757	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2776	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2758	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2777	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2778	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2797	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2779	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, */
2780	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, */
2781	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, {, \|, }, ~, */
2782	};	2801	};
2783	/* INDENT-ON */
2784		2802
2785	void	2803	void ecb_hot
2786	rxvt_term::process_csi_seq ()	2804	rxvt_term::process_csi_seq ()
2787	{	2805	{
2788	unicode_t ch, priv, i;	2806	unicode_t ch, priv, i;
2789	unsigned int nargs, p;	2807	unsigned int nargs, p;
2790	int n, ndef;	2808	int n, ndef;
…		…
2868	scr_soft_reset ();	2886	scr_soft_reset ();
2869		2887
2870	static const int pm_h[] = { 7, 25 };	2888	static const int pm_h[] = { 7, 25 };
2871	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 };
2872		2890
2873	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2891	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2874	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2892	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875	}	2893	}
2876	break;	2894	break;
2877	}	2895	}
2878		2896
2879	return;	2897	return;
…		…
2897	}	2915	}
2898	break;	2916	break;
2899	#endif	2917	#endif
2900		2918
2901	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2902	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2903	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2904	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2905	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2906	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2907	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2908	break;	2926	break;
2909		2927
2910	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2911	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3098	}	3116	}
3099	}	3117	}
3100	/}}} /	3118	/}}} /
3101		3119
3102	#if !ENABLE_MINIMAL	3120	#if !ENABLE_MINIMAL
3103	/* ARGSUSED */
3104	void	3121	void
3105	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3122	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106	{	3123	{
3107	int x, y;	3124	int x, y;
3108	XWindowAttributes wattr;	3125	XWindowAttributes wattr;
…		…
3145	break;	3162	break;
3146		3163
3147	//case 9: NYI, TODO, restore maximized window or maximize window	3164	//case 9: NYI, TODO, restore maximized window or maximize window
3148	default:	3165	default:
3149	if (args[0] >= 24) /* set height (chars) */	3166	if (args[0] >= 24) /* set height (chars) */
3150	set_widthheight ((unsigned int)width,	3167	set_widthheight ((unsigned int)vt_width,
3151	(unsigned int) (args[1] * fheight));	3168	(unsigned int) (args[1] * fheight));
3152	break;	3169	break;
3153		3170
3154	/*	3171	/*
3155	* reports - some output format copied from XTerm	3172	* reports - some output format copied from XTerm
…		…
3441	process_color_seq (op, Color_tint, str, resp);	3458	process_color_seq (op, Color_tint, str, resp);
3442	{	3459	{
3443	bool changed = false;	3460	bool changed = false;
3444		3461
3445	if (ISSET_PIXCOLOR (Color_tint))	3462	if (ISSET_PIXCOLOR (Color_tint))
3446	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3463	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3447		3464
3448	if (changed)	3465	if (changed)
3449	update_background ();	3466	update_background ();
3450	}	3467	}
3451		3468
…		…
3455	#if BG_IMAGE_FROM_FILE	3472	#if BG_IMAGE_FROM_FILE
3456	case Rxvt_Pixmap:	3473	case Rxvt_Pixmap:
3457	if (!strcmp (str, "?"))	3474	if (!strcmp (str, "?"))
3458	{	3475	{
3459	char str[256];	3476	char str[256];
		3477	int h_scale = 0, v_scale = 0;
		3478	int h_align = 0, v_align = 0;
		3479	if (image_vec.size () > 0)
		3480	{
		3481	h_scale = image_vec[0].h_scale;
		3482	v_scale = image_vec[0].v_scale;
		3483	h_align = image_vec[0].h_align;
		3484	v_align = image_vec[0].v_align;
		3485	}
3460		3486
3461	sprintf (str, "[%dx%d+%d+%d]",	3487	sprintf (str, "[%dx%d+%d+%d]",
3462	min (h_scale, 32767), min (v_scale, 32767),	3488	h_scale, v_scale,
3463	min (h_align, 32767), min (v_align, 32767));	3489	h_align, v_align);
3464	process_xterm_seq (XTerm_title, str, CHAR_ST);	3490	process_xterm_seq (XTerm_title, str, CHAR_ST);
3465	}	3491	}
3466	else	3492	else
3467	{	3493	{
3468	int changed = 0;	3494	bool changed = false;
3469		3495
3470	if (*str != ';')	3496	if (*str != ';')
3471	{	3497	{
3472	if (bg_set_file (str)) /* change pixmap */	3498	if (image_vec.size () > 0)
		3499	changed = image_vec[0].set_file_geometry (str);
		3500	else
3473	{	3501	{
3474	changed++;	3502	rxvt_image *image = new_image ();
3475	str = strchr (str, ';');	3503	if (!image->set_file_geometry (str))
3476	if (str == NULL)	3504	image_vec.pop_back ();
3477	bg_set_default_geometry ();
3478	else	3505	else
3479	bg_set_geometry (str+1);	3506	changed = true;
3480	}	3507	}
3481	}	3508	}
3482	else	3509	else
3483	{	3510	{
3484	str++;	3511	str++;
		3512	if (image_vec.size () > 0)
3485	if (bg_set_geometry (str, true))	3513	changed = image_vec[0].set_geometry (str, true);
3486	changed++;
3487	}	3514	}
3488		3515
3489	if (changed)	3516	if (changed)
3490	{	3517	{
3491	if (bg_window_position_sensitive ())	3518	if (bg_window_position_sensitive ())
…		…
3590	* 's' = save	3617	* 's' = save
3591	* 'r' = restore	3618	* 'r' = restore
3592	* 't' = toggle	3619	* 't' = toggle
3593	* so no need for fancy checking	3620	* so no need for fancy checking
3594	*/	3621	*/
3595	int	3622	int ecb_cold
3596	rxvt_term::privcases (int mode, unsigned long bit)	3623	rxvt_term::privcases (int mode, unsigned long bit)
3597	{	3624	{
3598	int state;	3625	int state;
3599		3626
3600	if (mode == 's')	3627	if (mode == 's')
3601	{	3628	{
3602	SavedModes \|= (priv_modes & bit);	3629	if (priv_modes & bit)
		3630	SavedModes \|= bit;
		3631	else
		3632	SavedModes &= ~bit;
3603	return -1;	3633	return -1;
3604	}	3634	}
3605	else	3635	else
3606	{	3636	{
3607	if (mode == 'r')	3637	if (mode == 'r')
3608	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3638	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609	else	3639	else
3610	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3640	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611		3641
3612	set_privmode (bit, state);	3642	if (state)
		3643	priv_modes \|= bit;
		3644	else
		3645	priv_modes &= ~bit;
3613	}	3646	}
3614		3647
3615	return state;	3648	return state;
3616	}	3649	}
3617		3650
3618	/* we're not using priv _yet_ */	3651	/* we're not using priv _yet_ */
3619	void	3652	void
3620	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3653	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621	{	3654	{
3622	unsigned int i, j;	3655	unsigned int i, j;
3623	int state;	3656	int state;
3624		3657
3625	static const struct	3658	static const struct
3626	{	3659	{
3627	const int argval;	3660	const int argval;
3628	const unsigned long bit;	3661	const unsigned long bit;
3629	} argtopriv[] = {	3662	} argtopriv[] = {
3630	{ 1, PrivMode_aplCUR }, // DECCKM	3663	{ 1, PrivMode_aplCUR }, // DECCKM
3631	{ 2, PrivMode_vt52 },	3664	{ 2, PrivMode_vt52 }, // DECANM
3632	{ 3, PrivMode_132 }, // DECCOLM	3665	{ 3, PrivMode_132 }, // DECCOLM
3633	{ 4, PrivMode_smoothScroll }, // DECSCLM	3666	{ 4, PrivMode_smoothScroll }, // DECSCLM
3634	{ 5, PrivMode_rVideo }, // DECSCNM	3667	{ 5, PrivMode_rVideo }, // DECSCNM
3635	{ 6, PrivMode_relOrigin }, // DECOM	3668	{ 6, PrivMode_relOrigin }, // DECOM
3636	{ 7, PrivMode_Autowrap }, // DECAWM	3669	{ 7, PrivMode_Autowrap }, // DECAWM
3637	// 8, auto-repeat keys // DECARM	3670	// 8, auto-repeat keys // DECARM
3638	{ 9, PrivMode_MouseX10 },	3671	{ 9, PrivMode_MouseX10 },
3639	// 18 end FF to printer after print screen	3672	// 18 end FF to printer after print screen
3640	// 19 Print screen prints full screen/scroll region	3673	// 19 Print screen prints full screen/scroll region
3641	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3674	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642	#ifdef scrollBar_esc	3675	#ifdef scrollBar_esc
3643	{ scrollBar_esc, PrivMode_scrollBar },	3676	{ scrollBar_esc, PrivMode_scrollBar },
3644	#endif	3677	#endif
3645	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3678	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3646	// 38, tektronix mode // DECTEK	3679	// 38, tektronix mode // DECTEK
3647	{ 40, PrivMode_132OK },	3680	{ 40, PrivMode_132OK },
3648	// 41 xterm more fixes NYI	3681	// 41 xterm more fixes NYI
3649	// 45 margin bell NYI	3682	// 45 margin bell NYI
3650	// 46 start logging	3683	// 46 start logging
3651	{ 47, PrivMode_Screen },	3684	{ 47, PrivMode_Screen },
3652	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3685	{ 66, PrivMode_aplKP }, // DECNKM
3653	#ifndef NO_BACKSPACE_KEY	3686	#ifndef NO_BACKSPACE_KEY
3654	{ 67, PrivMode_BackSpace }, // DECBKM	3687	{ 67, PrivMode_BackSpace }, // DECBKM
3655	#endif	3688	#endif
3656	{ 1000, PrivMode_MouseX11 },	3689	{ 1000, PrivMode_MouseX11 },
3657	{ 1002, PrivMode_MouseBtnEvent },	3690	{ 1002, PrivMode_MouseBtnEvent },
…		…
3686	for (i = 0; i < nargs; i++)	3719	for (i = 0; i < nargs; i++)
3687	{	3720	{
3688	state = -1;	3721	state = -1;
3689		3722
3690	/* basic handling */	3723	/* basic handling */
3691	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3724	for (j = 0; j < ecb_array_length (argtopriv); j++)
3692	if (argtopriv[j].argval == arg[i])	3725	if (argtopriv[j].argval == arg[i])
3693	{	3726	{
3694	state = privcases (mode, argtopriv[j].bit);	3727	state = privcases (mode, argtopriv[j].bit);
3695	break;	3728	break;
3696	}	3729	}
…		…
3722	case 2: /* VT52 mode */	3755	case 2: /* VT52 mode */
3723	/* oddball mode. should be set regardless of set/reset	3756	/* oddball mode. should be set regardless of set/reset
3724	* parameter. Return from VT52 mode with an ESC < from	3757	* parameter. Return from VT52 mode with an ESC < from
3725	* within VT52 mode	3758	* within VT52 mode
3726	*/	3759	*/
3727	set_privmode (PrivMode_vt52, 1);	3760	priv_modes \|= PrivMode_vt52;
3728	break;	3761	break;
3729	case 3: /* 80/132 */	3762	case 3: /* 80/132 */
3730	if (priv_modes & PrivMode_132OK)	3763	if (priv_modes & PrivMode_132OK)
3731	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3764	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3732	break;	3765	break;
…		…
3747	if (state) /* orthogonal */	3780	if (state) /* orthogonal */
3748	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3781	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3749	break;	3782	break;
3750	#ifdef scrollBar_esc	3783	#ifdef scrollBar_esc
3751	case scrollBar_esc:	3784	case scrollBar_esc:
3752	if (scrollBar.map (state))	3785	scrollBar.map (state);
3753	{
3754	resize_all_windows (0, 0, 0);	3786	resize_all_windows (0, 0, 0);
3755	scr_touch (true);	3787	scr_touch (true);
3756	}
3757	break;	3788	break;
3758	#endif	3789	#endif
3759	case 25: /* visible/invisible cursor */	3790	case 25: /* visible/invisible cursor */
3760	scr_cursor_visible (state);	3791	scr_cursor_visible (state);
3761	break;	3792	break;
…		…
3816	}	3847	}
3817	}	3848	}
3818	/}}} /	3849	/}}} /
3819		3850
3820	/{{{ process sgr sequences /	3851	/{{{ process sgr sequences /
3821	void	3852	void ecb_hot
3822	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3853	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3823	{	3854	{
3824	unsigned int i;	3855	unsigned int i;
3825	short rendset;	3856	short rendset;
3826	int rendstyle;	3857	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs. Revision 1.517 by root, Wed Jun 6 08:59:13 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.517 by root, Wed Jun 6 08:59:13 2012 UTC