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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR \|\| !x)	152	if (t != NOCHAR \|\| !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];	206	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	static inline wchar_t *
		406	rxvt_wcsdup (const wchar_t *str, int len)
		407	{
		408	wchar_t r = (wchar_t )rxvt_malloc ((len + 1) * sizeof (wchar_t));
		409	memcpy (r, str, len * sizeof (wchar_t));
		410	r[len] = 0;
		411	return r;
		412	}
		413
		414	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	415	rxvt_term::key_press (XKeyEvent &ev)
403	{	416	{
404	int ctrl, meta, shft, len;	417	int ctrl, meta, shft, len;
405	KeySym keysym;	418	KeySym keysym;
406	int valid_keysym;	419	int valid_keysym;
407	char kbuf[KBUFSZ];	420	char rkbuf[KBUFSZ];
		421	char *kbuf = rkbuf + 1;
408		422
409	#if ISO_14755	423	#if ISO_14755
410	if (iso14755buf & ISO_14755_52)	424	if (iso14755buf & ISO_14755_52)
411	return;	425	return;
412	#endif	426	#endif
…		…
421	ctrl = ev.state & ControlMask;	435	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	436	meta = ev.state & ModMetaMask;
423		437
424	kbuf[0] = 0;	438	kbuf[0] = 0;
425		439
426	#ifdef USE_XIM	440	#if USE_XIM
427	if (Input_Context)	441	if (Input_Context)
428	{	442	{
429	Status status_return;	443	Status status_return;
430		444
431	#if 0	445	#if 0
…		…
506	#endif	520	#endif
507	max_it (lnsppg, 1);	521	max_it (lnsppg, 1);
508		522
509	if (keysym == XK_Prior)	523	if (keysym == XK_Prior)
510	{	524	{
511	scr_page (UP, lnsppg);	525	scr_page (lnsppg);
512	return;	526	return;
513	}	527	}
514	else if (keysym == XK_Next)	528	else if (keysym == XK_Next)
515	{	529	{
516	scr_page (DN, lnsppg);	530	scr_page (-lnsppg);
517	return;	531	return;
518	}	532	}
519	}	533	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	534	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	535	if (IS_SCROLL_MOD)
522	{	536	{
523	if (keysym == XK_Up)	537	if (keysym == XK_Up)
524	{	538	{
525	scr_page (UP, 1);	539	scr_page (1);
526	return;	540	return;
527	}	541	}
528	else if (keysym == XK_Down)	542	else if (keysym == XK_Down)
529	{	543	{
530	scr_page (DN, 1);	544	scr_page (-1);
531	return;	545	return;
532	}	546	}
533	}	547	}
534	#endif	548	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	549	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	550	if (IS_SCROLL_MOD)
537	{	551	{
538	if (keysym == XK_Home)	552	if (keysym == XK_Home)
539	{	553	{
540	scr_move_to (0, 1);	554	scr_changeview (top_row);
541	return;	555	return;
542	}	556	}
543	else if (keysym == XK_End)	557	else if (keysym == XK_End)
544	{	558	{
545	scr_move_to (1, 1);	559	scr_changeview (0);
546	return;	560	return;
547	}	561	}
548	}	562	}
549	#endif	563	#endif
550	}	564	}
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	586	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	587	return;
574	#endif	588	#endif
575	}	589	}
576	}	590	}
		591	}
		592
		593	if (ctrl && meta && (keysym == XK_c \|\| keysym == XK_v))
		594	{
		595	if (keysym == XK_v)
		596	selection_request (ev.time, Sel_Clipboard);
		597	else if (selection.len > 0)
		598	{
		599	free (selection.clip_text);
		600	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		601	selection.clip_len = selection.len;
		602	selection_grab (CurrentTime, true);
		603	}
		604
		605	return;
577	}	606	}
578		607
579	#if ENABLE_FRILLS \|\| ISO_14755	608	#if ENABLE_FRILLS \|\| ISO_14755
580	// ISO 14755 support	609	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))	610	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
…		…
776	}	805	}
777		806
778	if (newlen)	807	if (newlen)
779	len = strlen (kbuf);	808	len = strlen (kbuf);
780		809
		810	if (len > 0)
		811	{
781	/*	812	/*
		813	* pass Shift/Control indicators for function keys ending with `~'
		814	*
		815	* eg,
		816	* Prior = "ESC[5~"
		817	* Shift+Prior = "ESC[5$"
		818	* Ctrl+Prior = "ESC[5^"
		819	* Ctrl+Shift+Prior = "ESC[5@"
		820	*/
		821	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		822	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		823
		824	/*
782	* Pass meta for all function keys, if 'meta' option set	825	* Pass meta for all function keys, if 'meta' option set
783	*/	826	*/
784	#ifdef META8_OPTION	827	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	828	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	829	kbuf[len - 1] \|= 0x80;
787	#endif	830	#endif
		831	}
788		832
789	}	833	}
790	else if (ctrl && keysym == XK_minus)	834	else if (ctrl && keysym == XK_minus)
791	{	835	{
792	len = 1;	836	len = 1;
…		…
811	meta = 0;	855	meta = 0;
812	}	856	}
813	#endif	857	#endif
814	/* nil */ ;	858	/* nil */ ;
815	}	859	}
		860	}
		861
		862	/* escape prefix */
		863	if (len && meta
		864	#ifdef META8_OPTION
		865	&& meta_char == C0_ESC
		866	#endif
		867	)
		868	{
		869	*--kbuf = C0_ESC;
		870	len++;
816	}	871	}
817		872
818	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))	873	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819	return;	874	return;
820		875
…		…
826	{	881	{
827	view_start = 0;	882	view_start = 0;
828	want_refresh = 1;	883	want_refresh = 1;
829	}	884	}
830		885
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */
846	if (meta
847	#ifdef META8_OPTION
848	&& meta_char == C0_ESC
849	#endif
850	)
851	{
852	const char ch = C0_ESC;
853	tt_write (&ch, 1);
854	}
855
856	tt_write (kbuf, (unsigned int)len);	886	tt_write (kbuf, (unsigned int)len);
857	}	887	}
858		888
859	void	889	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	890	rxvt_term::key_release (XKeyEvent &ev)
861	{	891	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	892	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	893	KeySym keysym;
864		894
…		…
936	void	966	void
937	rxvt_term::flush ()	967	rxvt_term::flush ()
938	{	968	{
939	flush_ev.stop ();	969	flush_ev.stop ();
940		970
941	#ifdef HAVE_BG_PIXMAP	971	#ifdef HAVE_IMG
942	if (bg_flags & BG_NEEDS_REFRESH)	972	if (bg_flags & BG_NEEDS_REFRESH)
943	{	973	{
944	bg_flags &= ~BG_NEEDS_REFRESH;	974	bg_flags &= ~BG_NEEDS_REFRESH;
945	scr_touch (false);	975	scr_touch (false);
946	}	976	}
…		…
986	while (row < end_row);	1016	while (row < end_row);
987	}	1017	}
988		1018
989	scr_refresh ();	1019	scr_refresh ();
990	scrollBar.show (1);	1020	scrollBar.show (1);
991	#ifdef USE_XIM	1021	#if USE_XIM
992	im_send_spot ();	1022	im_send_spot ();
993	#endif	1023	#endif
994	}	1024	}
995		1025
996	display->flush ();	1026	display->flush ();
…		…
1015	flush ();	1045	flush ();
1016	}	1046	}
1017		1047
1018	#ifdef CURSOR_BLINK	1048	#ifdef CURSOR_BLINK
1019	void	1049	void
		1050	rxvt_term::cursor_blink_reset ()
		1051	{
		1052	if (hidden_cursor)
		1053	{
		1054	hidden_cursor = 0;
		1055	want_refresh = 1;
		1056	}
		1057
		1058	if (option (Opt_cursorBlink))
		1059	cursor_blink_ev.again ();
		1060	else
		1061	cursor_blink_ev.stop ();
		1062	}
		1063
		1064	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1065	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1066	{
1022	hidden_cursor = !hidden_cursor;	1067	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1068	want_refresh = 1;
1024	refresh_check ();	1069	refresh_check ();
…		…
1057		1102
1058	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1059	void	1104	void
1060	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061	{	1106	{
1062	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_lines))
1063	{	1108	{
1064	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065	want_refresh = 1;	1110	want_refresh = 1;
1066	refresh_check ();	1111	refresh_check ();
1067	}	1112	}
…		…
1072		1117
1073	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074	void	1119	void
1075	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076	{	1121	{
1077	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1122	if (scr_page (mouse_slip_wheel_speed))
1078	{	1123	{
1079	want_refresh = 1;	1124	want_refresh = 1;
1080	refresh_check ();	1125	refresh_check ();
1081	}	1126	}
1082		1127
…		…
1203	pty_write ();	1248	pty_write ();
1204		1249
1205	refresh_check ();	1250	refresh_check ();
1206	}	1251	}
1207		1252
1208	void	1253	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1254	rxvt_term::pointer_unblank ()
1210	{	1255	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1256	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1257	recolour_cursor ();
1213		1258
…		…
1218	pointer_ev.start (pointerBlankDelay);	1263	pointer_ev.start (pointerBlankDelay);
1219	#endif	1264	#endif
1220	}	1265	}
1221		1266
1222	#ifdef POINTER_BLANK	1267	#ifdef POINTER_BLANK
1223	void	1268	void ecb_cold
1224	rxvt_term::pointer_blank ()	1269	rxvt_term::pointer_blank ()
1225	{	1270	{
1226	if (!option (Opt_pointerBlank))	1271	if (!option (Opt_pointerBlank))
1227	return;	1272	return;
1228		1273
…		…
1230	XFlush (dpy);	1275	XFlush (dpy);
1231		1276
1232	hidden_pointer = 1;	1277	hidden_pointer = 1;
1233	}	1278	}
1234		1279
1235	void	1280	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1281	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1282	{
1238	make_current ();	1283	make_current ();
1239		1284
1240	pointer_blank ();	1285	pointer_blank ();
…		…
1332	32 + x,	1377	32 + x,
1333	32 + y);	1378	32 + y);
1334	}	1379	}
1335		1380
1336	/{{{ process an X event /	1381	/{{{ process an X event /
1337	void	1382	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1383	rxvt_term::x_cb (XEvent &ev)
1339	{	1384	{
1340	make_current ();	1385	make_current ();
1341		1386
1342	dLocal (Display *, dpy);	1387	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1490	if (ev.xconfigure.window == parent)
1446	{	1491	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1492	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1493	;
1449		1494
		1495	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1496
		1497	bool moved = false;
1450	#ifdef HAVE_BG_PIXMAP	1498	#ifdef HAVE_BG_PIXMAP
1451	bool moved = false;
1452	if (bg_window_position_sensitive ())	1499	if (bg_window_position_sensitive ())
1453	{	1500	{
		1501	want_position_change = true;
		1502	if (bg_img == 0)
		1503	moved = true;
		1504	}
		1505	#endif
		1506
		1507	if (want_position_change)
		1508	{
1454	int x, y;	1509	int x, y;
		1510
1455	if (ev.xconfigure.send_event)	1511	if (ev.xconfigure.send_event)
1456	{	1512	{
1457	x = ev.xconfigure.x;	1513	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1514	y = ev.xconfigure.y;
1459	}	1515	}
1460	else	1516	else
1461	get_window_origin (x, y);	1517	get_window_origin (x, y);
1462		1518
1463	if (bg_set_position (x, y)	1519	if (x != parent_x \|\| y != parent_y)
1464	\|\| !(bg_flags & BG_IS_VALID))	1520	{
		1521	parent_x = x;
		1522	parent_y = y;
		1523	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465	moved = true;	1524	moved = true;
		1525	}
1466	}	1526	}
1467	#endif
1468		1527
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1528	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1529	{
1471	seen_resize = 1;	1530	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1531	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1495	selection_send (ev.xselectionrequest);	1554	selection_send (ev.xselectionrequest);
1496	break;	1555	break;
1497		1556
1498	case MapNotify:	1557	case MapNotify:
1499	#ifdef HAVE_BG_PIXMAP	1558	#ifdef HAVE_BG_PIXMAP
1500	/* This is needed specifically to fix the case of no window manager or a	1559	// This is needed at startup for the case of no window manager
1501	* non-reparenting window manager. In those cases we never get first	1560	// or a non-reparenting window manager and also because we
1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1561	// defer bg image updates if the window is not mapped. The
1503	* care of multiplicity of ConfigureNotify events arriving while WM does	1562	// short delay is to optimize for multiple ConfigureNotify
1504	* reparenting.	1563	// events at startup when the window manager reparents the
1505	* We should not render background immediately, as there could be several	1564	// window, so as to perform the computation after we have
1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1565	// received all of them.
1507	* by scheduling background redraw as soon as we can, but giving a short	1566	if (bg_img == 0)
1508	* bit of time for ConfigureNotifies to arrive.
1509	* We should render background PRIOR to drawing any text, but AFTER all
1510	* of ConfigureNotifys for the best results.
1511	*/
1512	if (!(bg_flags & BG_IS_VALID))
1513	update_background_ev.start (0.025);	1567	update_background_ev.start (0.025);
1514	#endif	1568	#endif
1515	mapped = 1;	1569	mapped = 1;
1516	#ifdef TEXT_BLINK	1570	#ifdef TEXT_BLINK
1517	text_blink_ev.start ();	1571	text_blink_ev.start ();
…		…
1609		1663
1610	#ifdef SELECTION_SCROLLING	1664	#ifdef SELECTION_SCROLLING
1611	if (ev.xbutton.y < int_bwidth	1665	if (ev.xbutton.y < int_bwidth
1612	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1666	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1613	{	1667	{
		1668	page_dirn scroll_selection_dir;
1614	int dist;	1669	int dist;
1615		1670
1616	/* don't clobber the current delay if we are	1671	/* don't clobber the current delay if we are
1617	* already in the middle of scrolling.	1672	* already in the middle of scrolling.
1618	*/	1673	*/
…		…
1633	dist = int_bwidth - ev.xbutton.y;	1688	dist = int_bwidth - ev.xbutton.y;
1634	}	1689	}
1635	else	1690	else
1636	{	1691	{
1637	scroll_selection_dir = DN;	1692	scroll_selection_dir = DN;
1638	dist = ev.xbutton.y - (int_bwidth + height);	1693	dist = ev.xbutton.y - (int_bwidth + vt_height);
1639	}	1694	}
1640		1695
1641	scroll_selection_lines = Pixel2Height (dist)	1696	scroll_selection_lines = Pixel2Height (dist)
1642	/ SELECTION_SCROLL_LINE_SPEEDUP	1697	/ SELECTION_SCROLL_LINE_SPEEDUP
1643	+ 1;	1698	+ 1;
1644	min_it (scroll_selection_lines,	1699	min_it (scroll_selection_lines,
1645	SELECTION_SCROLL_MAX_LINES);	1700	SELECTION_SCROLL_MAX_LINES);
		1701	scroll_selection_lines *= scroll_selection_dir;
1646	}	1702	}
1647	else	1703	else
1648	{	1704	{
1649	/* we are within the text window, so we	1705	/* we are within the text window, so we
1650	* shouldn't be scrolling	1706	* shouldn't be scrolling
…		…
1675	}	1731	}
1676	break;	1732	break;
1677	}	1733	}
1678		1734
1679	#if defined(CURSOR_BLINK)	1735	#if defined(CURSOR_BLINK)
1680	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1736	if (ev.type == KeyPress)
1681	{
1682	if (hidden_cursor)
1683	{
1684	hidden_cursor = 0;
1685	want_refresh = 1;
1686	}
1687
1688	cursor_blink_ev.again ();	1737	cursor_blink_reset ();
1689	}
1690	#endif	1738	#endif
1691		1739
1692	#if defined(POINTER_BLANK)	1740	#if defined(POINTER_BLANK)
1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1741	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694	{	1742	{
…		…
1705		1753
1706	refresh_check ();	1754	refresh_check ();
1707	}	1755	}
1708		1756
1709	#if ENABLE_FRILLS	1757	#if ENABLE_FRILLS
1710	void	1758	void ecb_cold
1711	rxvt_term::set_urgency (bool enable)	1759	rxvt_term::set_urgency (bool enable)
1712	{	1760	{
1713	if (enable == urgency_hint)	1761	if (enable == urgency_hint)
1714	return;	1762	return;
1715		1763
…		…
1721	XFree (h);	1769	XFree (h);
1722	}	1770	}
1723	}	1771	}
1724	#endif	1772	#endif
1725		1773
1726	void	1774	void ecb_cold
1727	rxvt_term::focus_in ()	1775	rxvt_term::focus_in ()
1728	{	1776	{
1729	if (!focus)	1777	if (!focus)
1730	{	1778	{
1731	focus = 1;	1779	focus = 1;
…		…
1756		1804
1757	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1805	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758	}	1806	}
1759	}	1807	}
1760		1808
1761	void	1809	void ecb_cold
1762	rxvt_term::focus_out ()	1810	rxvt_term::focus_out ()
1763	{	1811	{
1764	if (focus)	1812	if (focus)
1765	{	1813	{
1766	focus = 0;	1814	focus = 0;
…		…
1799		1847
1800	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1848	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801	}	1849	}
1802	}	1850	}
1803		1851
1804	void	1852	void ecb_cold
1805	rxvt_term::update_fade_color (unsigned int idx)	1853	rxvt_term::update_fade_color (unsigned int idx)
1806	{	1854	{
1807	#if OFF_FOCUS_FADING	1855	#if OFF_FOCUS_FADING
1808	if (rs[Rs_fade])	1856	if (rs[Rs_fade])
1809	{	1857	{
…		…
1812	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1860	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1813	}	1861	}
1814	#endif	1862	#endif
1815	}	1863	}
1816		1864
1817	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1865	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1818	void	1866	void ecb_hot
1819	rxvt_term::rootwin_cb (XEvent &ev)	1867	rxvt_term::rootwin_cb (XEvent &ev)
1820	{	1868	{
1821	make_current ();	1869	make_current ();
1822		1870
1823	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1871	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1872	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825	return;	1873	return;
1826		1874
1827	# if ENABLE_TRANSPARENCY
1828	switch (ev.type)	1875	switch (ev.type)
1829	{	1876	{
1830	case PropertyNotify:	1877	case PropertyNotify:
1831	/*	1878	/*
1832	* if user used some Esetroot compatible prog to set the root bg,	1879	* if user used some Esetroot compatible prog to set the root bg,
1833	* use the property to determine the pixmap. We use it later on.	1880	* use the property to determine the pixmap. We use it later on.
1834	*/	1881	*/
1835	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1882	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1883	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837	{	1884	{
1838	bg_set_root_pixmap ();	1885	#if BG_IMAGE_FROM_ROOT
		1886	if (option (Opt_transparent))
		1887	{
		1888	rxvt_img::new_from_root (this)->replace (root_img);
1839	update_background ();	1889	update_background ();
		1890	}
		1891	#endif
		1892	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1840	}	1893	}
1841		1894
1842	break;	1895	break;
1843	}	1896	}
1844	# endif
1845		1897
1846	refresh_check ();	1898	refresh_check ();
1847	}	1899	}
1848	#endif	1900	#endif
1849		1901
…		…
2162	case Button3:	2214	case Button3:
2163	selection_make (ev.time);	2215	selection_make (ev.time);
2164	break;	2216	break;
2165		2217
2166	case Button2:	2218	case Button2:
2167	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2219	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2168	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2220	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169	break;	2221	break;
2170		2222
2171	#ifdef MOUSE_WHEEL	2223	#ifdef MOUSE_WHEEL
2172	case Button4:	2224	case Button4:
2173	case Button5:	2225	case Button5:
2174	{	2226	{
2175	int i;	2227	int lines;
2176	page_dirn v;	2228	page_dirn dirn;
2177		2229
2178	v = ev.button == Button4 ? UP : DN;	2230	dirn = ev.button == Button4 ? UP : DN;
2179		2231
2180	if (ev.state & ShiftMask)	2232	if (ev.state & ShiftMask)
2181	i = 1;	2233	lines = 1;
2182	else if (option (Opt_mouseWheelScrollPage))	2234	else if (option (Opt_mouseWheelScrollPage))
2183	i = nrow - 1;	2235	lines = nrow - 1;
2184	else	2236	else
2185	i = 5;	2237	lines = 5;
2186		2238
2187	# ifdef MOUSE_SLIP_WHEELING	2239	# ifdef MOUSE_SLIP_WHEELING
2188	if (ev.state & ControlMask)	2240	if (ev.state & ControlMask)
2189	{	2241	{
2190	mouse_slip_wheel_speed += v ? -1 : 1;	2242	mouse_slip_wheel_speed += dirn;
2191	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2243	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2192	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2193		2244
2194	if (!slip_wheel_ev.is_active ())	2245	if (!slip_wheel_ev.is_active ())
2195	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2246	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2196	}	2247	}
2197	else	2248	else
2198	# endif	2249	# endif
2199	{	2250	{
2200	scr_page (v, i);	2251	scr_page (dirn, lines);
2201	scrollBar.show (1);	2252	scrollBar.show (1);
2202	}	2253	}
2203	}	2254	}
2204	break;	2255	break;
2205	#endif	2256	#endif
…		…
2207	}	2258	}
2208	}	2259	}
2209		2260
2210	/}}} /	2261	/}}} /
2211		2262
2212	void	2263	void ecb_hot
2213	rxvt_term::cmd_parse ()	2264	rxvt_term::cmd_parse ()
2214	{	2265	{
2215	wchar_t ch = NOCHAR;	2266	wchar_t ch = NOCHAR;
2216	char *seq_begin; // remember start of esc-sequence here	2267	char *seq_begin; // remember start of esc-sequence here
2217		2268
…		…
2336	}	2387	}
2337	}	2388	}
2338	}	2389	}
2339		2390
2340	// read the next character	2391	// read the next character
2341	wchar_t	2392	wchar_t ecb_hot
2342	rxvt_term::next_char () NOTHROW	2393	rxvt_term::next_char () NOTHROW
2343	{	2394	{
2344	while (cmdbuf_ptr < cmdbuf_endp)	2395	while (cmdbuf_ptr < cmdbuf_endp)
2345	{	2396	{
2346	// assume 7-bit to be ascii ALWAYS	2397	// assume 7-bit to be ascii ALWAYS
…		…
2358	}	2409	}
2359		2410
2360	if (len == (size_t)-1)	2411	if (len == (size_t)-1)
2361	{	2412	{
2362	mbstate.reset (); // reset now undefined conversion state	2413	mbstate.reset (); // reset now undefined conversion state
		2414	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2415	// in which case we "erroneously" return the next byte which might be valid.
2363	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2416	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364	}	2417	}
2365		2418
2366	// assume wchar == unicode	2419	// assume wchar == unicode
2367	cmdbuf_ptr += len;	2420	cmdbuf_ptr += len;
…		…
2370		2423
2371	return NOCHAR;	2424	return NOCHAR;
2372	}	2425	}
2373		2426
2374	// read the next octet	2427	// read the next octet
2375	uint32_t	2428	uint32_t ecb_hot
2376	rxvt_term::next_octet () NOTHROW	2429	rxvt_term::next_octet () NOTHROW
2377	{	2430	{
2378	return cmdbuf_ptr < cmdbuf_endp	2431	return cmdbuf_ptr < cmdbuf_endp
2379	? (unsigned char)*cmdbuf_ptr++	2432	? (unsigned char)*cmdbuf_ptr++
2380	: NOCHAR;	2433	: NOCHAR;
2381	}	2434	}
2382		2435
2383	static class out_of_input out_of_input;	2436	static class out_of_input out_of_input;
2384		2437
2385	wchar_t	2438	wchar_t ecb_hot
2386	rxvt_term::cmd_getc () THROW ((class out_of_input))	2439	rxvt_term::cmd_getc () THROW ((class out_of_input))
2387	{	2440	{
2388	wchar_t c = next_char ();	2441	wchar_t c = next_char ();
2389		2442
2390	if (c == NOCHAR)	2443	if (c == NOCHAR)
2391	throw out_of_input;	2444	throw out_of_input;
2392		2445
2393	return c;	2446	return c;
2394	}	2447	}
2395		2448
2396	uint32_t	2449	uint32_t ecb_hot
2397	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2450	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2398	{	2451	{
2399	uint32_t c = next_octet ();	2452	uint32_t c = next_octet ();
2400		2453
2401	if (c == NOCHAR)	2454	if (c == NOCHAR)
…		…
2405	}	2458	}
2406		2459
2407	/{{{ print pipe /	2460	/{{{ print pipe /
2408	/----------------------------------------------------------------------/	2461	/----------------------------------------------------------------------/
2409	#ifdef PRINTPIPE	2462	#ifdef PRINTPIPE
2410	FILE *	2463	FILE * ecb_cold
2411	rxvt_term::popen_printer ()	2464	rxvt_term::popen_printer ()
2412	{	2465	{
2413	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2466	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2414		2467
2415	if (stream == NULL)	2468	if (stream == NULL)
2416	rxvt_warn ("can't open printer pipe, not printing.\n");	2469	rxvt_warn ("can't open printer pipe, not printing.\n");
2417		2470
2418	return stream;	2471	return stream;
2419	}	2472	}
2420		2473
2421	int	2474	int ecb_cold
2422	rxvt_term::pclose_printer (FILE *stream)	2475	rxvt_term::pclose_printer (FILE *stream)
2423	{	2476	{
2424	fflush (stream);	2477	fflush (stream);
2425	return pclose (stream);	2478	return pclose (stream);
2426	}	2479	}
2427		2480
2428	/*	2481	/*
2429	* simulate attached vt100 printer	2482	* simulate attached vt100 printer
2430	*/	2483	*/
2431	void	2484	void ecb_cold
2432	rxvt_term::process_print_pipe ()	2485	rxvt_term::process_print_pipe ()
2433	{	2486	{
2434	FILE *fd = popen_printer ();	2487	FILE *fd = popen_printer ();
2435		2488
2436	if (!fd)	2489	if (!fd)
…		…
2491	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2544	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2492	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2545	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2493	};	2546	};
2494		2547
2495	/{{{ process non-printing single characters /	2548	/{{{ process non-printing single characters /
2496	void	2549	void ecb_hot
2497	rxvt_term::process_nonprinting (unicode_t ch)	2550	rxvt_term::process_nonprinting (unicode_t ch)
2498	{	2551	{
2499	switch (ch)	2552	switch (ch)
2500	{	2553	{
2501	case C0_ESC:	2554	case C0_ESC:
…		…
2547	}	2600	}
2548	/}}} /	2601	/}}} /
2549		2602
2550		2603
2551	/{{{ process VT52 escape sequences /	2604	/{{{ process VT52 escape sequences /
2552	void	2605	void ecb_cold
2553	rxvt_term::process_escape_vt52 (unicode_t ch)	2606	rxvt_term::process_escape_vt52 (unicode_t ch)
2554	{	2607	{
2555	int row, col;	2608	int row, col;
2556		2609
2557	switch (ch)	2610	switch (ch)
…		…
2607	}	2660	}
2608	/}}} /	2661	/}}} /
2609		2662
2610		2663
2611	/{{{ process escape sequences /	2664	/{{{ process escape sequences /
2612	void	2665	void ecb_hot
2613	rxvt_term::process_escape_seq ()	2666	rxvt_term::process_escape_seq ()
2614	{	2667	{
2615	unicode_t ch = cmd_getc ();	2668	unicode_t ch = cmd_getc ();
2616		2669
2617	if (priv_modes & PrivMode_vt52)	2670	if (priv_modes & PrivMode_vt52)
…		…
2769	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2822	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2770	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2823	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2771	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2824	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2772	};	2825	};
2773		2826
2774	void	2827	void ecb_hot
2775	rxvt_term::process_csi_seq ()	2828	rxvt_term::process_csi_seq ()
2776	{	2829	{
2777	unicode_t ch, priv, i;	2830	unicode_t ch, priv, prev_ch, i;
2778	unsigned int nargs, p;	2831	unsigned int nargs, p;
2779	int n, ndef;	2832	int n, ndef;
2780	int arg[ESC_ARGS] = { };	2833	int arg[ESC_ARGS] = { };
2781		2834
2782	nargs = 0;	2835	nargs = 0;
…		…
2788	/* '<' '=' '>' '?' '!' */	2841	/* '<' '=' '>' '?' '!' */
2789	priv = ch;	2842	priv = ch;
2790	ch = cmd_getc ();	2843	ch = cmd_getc ();
2791	}	2844	}
2792		2845
		2846	prev_ch = 0;
2793	/* read any numerical arguments */	2847	/* read any numerical arguments */
2794	for (n = -1; ch < CSI_ICH; )	2848	for (n = -1; ch < CSI_ICH; )
2795	{	2849	{
2796	if (isdigit (ch))	2850	if (isdigit (ch))
2797	{	2851	{
…		…
2807	n = -1;	2861	n = -1;
2808	}	2862	}
2809	else if (IS_CONTROL (ch))	2863	else if (IS_CONTROL (ch))
2810	process_nonprinting (ch);	2864	process_nonprinting (ch);
2811		2865
		2866	prev_ch = ch;
2812	ch = cmd_getc ();	2867	ch = cmd_getc ();
2813	}	2868	}
2814		2869
2815	if (ch > CSI_7F)	2870	if (ch > CSI_7F)
2816	return;	2871	return;
…		…
2886	}	2941	}
2887	break;	2942	break;
2888	#endif	2943	#endif
2889		2944
2890	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2945	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2891	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2946	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2892	arg[0] = -arg[0];	2947	arg[0] = -arg[0];
2893	/* FALLTHROUGH */	2948	/* FALLTHROUGH */
2894	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2949	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2895	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2950	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2896	scr_gotorc (arg[0], 0, RELATIVE);	2951	scr_gotorc (arg[0], 0, RELATIVE);
2897	break;	2952	break;
2898		2953
2899	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2954	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2900	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2955	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3050	scr_insert_mode (1);	3105	scr_insert_mode (1);
3051	else if (arg[0] == 20)	3106	else if (arg[0] == 20)
3052	priv_modes \|= PrivMode_LFNL;	3107	priv_modes \|= PrivMode_LFNL;
3053	break;	3108	break;
3054		3109
		3110	case CSI_71: // DESCUSR: set cursor style
		3111	if (prev_ch == ' ')
		3112	set_cursor_style (arg[0]);
		3113	break;
		3114
3055	/*	3115	/*
3056	* PRIVATE USE beyond this point. All CSI_7? sequences here	3116	* PRIVATE USE beyond this point. All CSI_7? sequences here
3057	*/	3117	*/
3058	case CSI_72: /* DECSTBM: set top and bottom margins */	3118	case CSI_72: /* DECSTBM: set top and bottom margins */
3059	if (nargs == 1)	3119	if (nargs == 1)
…		…
3133	break;	3193	break;
3134		3194
3135	//case 9: NYI, TODO, restore maximized window or maximize window	3195	//case 9: NYI, TODO, restore maximized window or maximize window
3136	default:	3196	default:
3137	if (args[0] >= 24) /* set height (chars) */	3197	if (args[0] >= 24) /* set height (chars) */
3138	set_widthheight ((unsigned int)width,	3198	set_widthheight ((unsigned int)vt_width,
3139	(unsigned int) (args[1] * fheight));	3199	(unsigned int) (args[1] * fheight));
3140	break;	3200	break;
3141		3201
3142	/*	3202	/*
3143	* reports - some output format copied from XTerm	3203	* reports - some output format copied from XTerm
…		…
3192	rxvt_term::get_to_st (unicode_t &ends_how)	3252	rxvt_term::get_to_st (unicode_t &ends_how)
3193	{	3253	{
3194	unicode_t ch;	3254	unicode_t ch;
3195	bool seen_esc = false;	3255	bool seen_esc = false;
3196	unsigned int n = 0;	3256	unsigned int n = 0;
3197	wchar_t string[STRING_MAX];	3257	wchar_t string[CBUFSIZ];
3198		3258
3199	while ((ch = cmd_getc ()) != NOCHAR)	3259	while ((ch = cmd_getc ()) != NOCHAR)
3200	{	3260	{
3201	if (seen_esc)	3261	if (seen_esc)
3202	{	3262	{
…		…
3217	else if (ch < 0x20)	3277	else if (ch < 0x20)
3218	return NULL; /* other control character - exit */	3278	return NULL; /* other control character - exit */
3219		3279
3220	seen_esc = false;	3280	seen_esc = false;
3221		3281
3222	if (n >= STRING_MAX - 1)	3282	if (n >= sizeof (string) - 1)
3223	// stop at some sane length	3283	// stop at some sane length
3224	return NULL;	3284	return NULL;
3225		3285
3226	string[n++] = ch;	3286	string[n++] = ch;
3227	}	3287	}
…		…
3344	&nitems, &bytes_after, &value) == Success	3404	&nitems, &bytes_after, &value) == Success
3345	&& actual_type != None	3405	&& actual_type != None
3346	&& actual_format == 8)	3406	&& actual_format == 8)
3347	str = (const char *)(value);	3407	str = (const char *)(value);
3348		3408
3349	tt_printf ("\033]%d;%s%c", op, str, resp);	3409	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3350		3410
3351	XFree (value);	3411	XFree (value);
3352	}	3412	}
3353	else	3413	else
3354	{	3414	{
…		…
3422	break;	3482	break;
3423	#endif	3483	#endif
3424	case URxvt_Color_border:	3484	case URxvt_Color_border:
3425	process_color_seq (op, Color_border, str, resp);	3485	process_color_seq (op, Color_border, str, resp);
3426	break;	3486	break;
3427	#if ENABLE_TRANSPARENCY	3487
		3488	#if BG_IMAGE_FROM_ROOT
3428	case URxvt_Color_tint:	3489	case URxvt_Color_tint:
3429	process_color_seq (op, Color_tint, str, resp);	3490	process_color_seq (op, Color_tint, str, resp);
3430	{	3491	{
3431	bool changed = false;	3492	bool changed = false;
3432		3493
3433	if (ISSET_PIXCOLOR (Color_tint))	3494	if (ISSET_PIXCOLOR (Color_tint))
3434	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3495	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435		3496
3436	if (changed)	3497	if (changed)
3437	update_background ();	3498	update_background ();
3438	}	3499	}
3439		3500
…		…
3443	#if BG_IMAGE_FROM_FILE	3504	#if BG_IMAGE_FROM_FILE
3444	case Rxvt_Pixmap:	3505	case Rxvt_Pixmap:
3445	if (!strcmp (str, "?"))	3506	if (!strcmp (str, "?"))
3446	{	3507	{
3447	char str[256];	3508	char str[256];
		3509	int h_scale = fimage.h_scale;
		3510	int v_scale = fimage.v_scale;
		3511	int h_align = fimage.h_align;
		3512	int v_align = fimage.v_align;
3448		3513
3449	sprintf (str, "[%dx%d+%d+%d]",	3514	sprintf (str, "[%dx%d+%d+%d]",
3450	min (h_scale, 32767), min (v_scale, 32767),	3515	h_scale, v_scale,
3451	min (h_align, 32767), min (v_align, 32767));	3516	h_align, v_align);
3452	process_xterm_seq (XTerm_title, str, CHAR_ST);	3517	process_xterm_seq (XTerm_title, str, CHAR_ST);
3453	}	3518	}
3454	else	3519	else
3455	{	3520	{
3456	bool changed = false;	3521	bool changed = false;
3457		3522
3458	if (*str != ';')	3523	if (*str != ';')
3459	{	3524	{
3460	if (bg_set_file (str)) /* change pixmap */	3525	try
		3526	{
		3527	fimage.set_file_geometry (this, str);
3461	changed = true;	3528	changed = true;
		3529	}
		3530	catch (const class rxvt_failure_exception &e)
		3531	{
		3532	}
3462	}	3533	}
3463	else	3534	else
3464	{	3535	{
3465	str++;	3536	str++;
3466	if (bg_set_geometry (str, true))	3537	if (fimage.set_geometry (str, true))
3467	changed = true;	3538	changed = true;
3468	}	3539	}
3469		3540
3470	if (changed)	3541	if (changed)
3471	{	3542	{
3472	if (bg_window_position_sensitive ())	3543	if (bg_window_position_sensitive ())
3473	{	3544	{
3474	int x, y;	3545	int x, y;
3475	get_window_origin (x, y);	3546	get_window_origin (x, y);
3476	bg_set_position (x, y);	3547	parent_x = x;
		3548	parent_y = y;
3477	}	3549	}
3478	update_background ();	3550	update_background ();
3479	}	3551	}
3480	}	3552	}
3481	break;	3553	break;
…		…
3571	* 's' = save	3643	* 's' = save
3572	* 'r' = restore	3644	* 'r' = restore
3573	* 't' = toggle	3645	* 't' = toggle
3574	* so no need for fancy checking	3646	* so no need for fancy checking
3575	*/	3647	*/
3576	int	3648	int ecb_cold
3577	rxvt_term::privcases (int mode, unsigned long bit)	3649	rxvt_term::privcases (int mode, unsigned long bit)
3578	{	3650	{
3579	int state;	3651	int state;
3580		3652
3581	if (mode == 's')	3653	if (mode == 's')
3582	{	3654	{
3583	SavedModes \|= (priv_modes & bit);	3655	if (priv_modes & bit)
		3656	SavedModes \|= bit;
		3657	else
		3658	SavedModes &= ~bit;
3584	return -1;	3659	return -1;
3585	}	3660	}
3586	else	3661	else
3587	{	3662	{
3588	if (mode == 'r')	3663	if (mode == 'r')
…		…
3798	}	3873	}
3799	}	3874	}
3800	/}}} /	3875	/}}} /
3801		3876
3802	/{{{ process sgr sequences /	3877	/{{{ process sgr sequences /
3803	void	3878	void ecb_hot
3804	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3879	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3805	{	3880	{
3806	unsigned int i;	3881	unsigned int i;
3807	short rendset;	3882	short rendset;
3808	int rendstyle;	3883	int rendstyle;
…		…
3949	break;	4024	break;
3950	#endif	4025	#endif
3951	}	4026	}
3952	}	4027	}
3953	}	4028	}
		4029
		4030	void
		4031	rxvt_term::set_cursor_style (int style)
		4032	{
		4033	if (!IN_RANGE_INC (style, 0, 4))
		4034	return;
		4035
		4036	set_option (Opt_cursorUnderline, style >= 3);
		4037
		4038	#ifdef CURSOR_BLINK
		4039	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4040	cursor_blink_reset ();
		4041	#endif
		4042
		4043	want_refresh = 1;
		4044	}
3954	/}}} /	4045	/}}} /
3955		4046
3956	/* ------------------------------------------------------------------------- */	4047	/* ------------------------------------------------------------------------- */
3957		4048
3958	/*	4049	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs. Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC