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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs.
Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 2013 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR \|\| !x)	152	if (t != NOCHAR \|\| !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];	206	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
403	{	407	{
404	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
405	KeySym keysym;	409	KeySym keysym;
406	int valid_keysym;	410	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
423		427
424	kbuf[0] = 0;	428	kbuf[0] = 0;
425		429
426	#ifdef USE_XIM	430	#if USE_XIM
427	if (Input_Context)	431	if (Input_Context)
428	{	432	{
429	Status status_return;	433	Status status_return;
430		434
431	#if 0	435	#if 0
…		…
506	#endif	510	#endif
507	max_it (lnsppg, 1);	511	max_it (lnsppg, 1);
508		512
509	if (keysym == XK_Prior)	513	if (keysym == XK_Prior)
510	{	514	{
511	scr_page (UP, lnsppg);	515	scr_page (lnsppg);
512	return;	516	return;
513	}	517	}
514	else if (keysym == XK_Next)	518	else if (keysym == XK_Next)
515	{	519	{
516	scr_page (DN, lnsppg);	520	scr_page (-lnsppg);
517	return;	521	return;
518	}	522	}
519	}	523	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	524	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	525	if (IS_SCROLL_MOD)
522	{	526	{
523	if (keysym == XK_Up)	527	if (keysym == XK_Up)
524	{	528	{
525	scr_page (UP, 1);	529	scr_page (1);
526	return;	530	return;
527	}	531	}
528	else if (keysym == XK_Down)	532	else if (keysym == XK_Down)
529	{	533	{
530	scr_page (DN, 1);	534	scr_page (-1);
531	return;	535	return;
532	}	536	}
533	}	537	}
534	#endif	538	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	539	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	540	if (IS_SCROLL_MOD)
537	{	541	{
538	if (keysym == XK_Home)	542	if (keysym == XK_Home)
539	{	543	{
540	scr_move_to (0, 1);	544	scr_changeview (top_row);
541	return;	545	return;
542	}	546	}
543	else if (keysym == XK_End)	547	else if (keysym == XK_End)
544	{	548	{
545	scr_move_to (1, 1);	549	scr_changeview (0);
546	return;	550	return;
547	}	551	}
548	}	552	}
549	#endif	553	#endif
550	}	554	}
…		…
855	}	859	}
856		860
857	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
858	}	862	}
859		863
860	void	864	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
862	{	866	{
863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
864	KeySym keysym;	868	KeySym keysym;
865		869
…		…
937	void	941	void
938	rxvt_term::flush ()	942	rxvt_term::flush ()
939	{	943	{
940	flush_ev.stop ();	944	flush_ev.stop ();
941		945
942	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
944	{	948	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	950	scr_touch (false);
947	}	951	}
…		…
987	while (row < end_row);	991	while (row < end_row);
988	}	992	}
989		993
990	scr_refresh ();	994	scr_refresh ();
991	scrollBar.show (1);	995	scrollBar.show (1);
992	#ifdef USE_XIM	996	#if USE_XIM
993	im_send_spot ();	997	im_send_spot ();
994	#endif	998	#endif
995	}	999	}
996		1000
997	display->flush ();	1001	display->flush ();
…		…
1016	flush ();	1020	flush ();
1017	}	1021	}
1018		1022
1019	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1020	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
1021	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1022	{	1041	{
1023	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1024	want_refresh = 1;	1043	want_refresh = 1;
1025	refresh_check ();	1044	refresh_check ();
…		…
1058		1077
1059	#ifdef SELECTION_SCROLLING	1078	#ifdef SELECTION_SCROLLING
1060	void	1079	void
1061	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1080	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1062	{	1081	{
1063	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1082	if (scr_page (scroll_selection_lines))
1064	{	1083	{
1065	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1084	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1066	want_refresh = 1;	1085	want_refresh = 1;
1067	refresh_check ();	1086	refresh_check ();
1068	}	1087	}
…		…
1073		1092
1074	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1093	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1075	void	1094	void
1076	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1095	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1077	{	1096	{
1078	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1097	if (scr_page (mouse_slip_wheel_speed))
1079	{	1098	{
1080	want_refresh = 1;	1099	want_refresh = 1;
1081	refresh_check ();	1100	refresh_check ();
1082	}	1101	}
1083		1102
…		…
1204	pty_write ();	1223	pty_write ();
1205		1224
1206	refresh_check ();	1225	refresh_check ();
1207	}	1226	}
1208		1227
1209	void	1228	void ecb_cold
1210	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1211	{	1230	{
1212	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1213	recolour_cursor ();	1232	recolour_cursor ();
1214		1233
…		…
1219	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1220	#endif	1239	#endif
1221	}	1240	}
1222		1241
1223	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1224	void	1243	void ecb_cold
1225	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1226	{	1245	{
1227	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1228	return;	1247	return;
1229		1248
…		…
1231	XFlush (dpy);	1250	XFlush (dpy);
1232		1251
1233	hidden_pointer = 1;	1252	hidden_pointer = 1;
1234	}	1253	}
1235		1254
1236	void	1255	void ecb_cold
1237	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1238	{	1257	{
1239	make_current ();	1258	make_current ();
1240		1259
1241	pointer_blank ();	1260	pointer_blank ();
…		…
1333	32 + x,	1352	32 + x,
1334	32 + y);	1353	32 + y);
1335	}	1354	}
1336		1355
1337	/{{{ process an X event /	1356	/{{{ process an X event /
1338	void	1357	void ecb_hot
1339	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1340	{	1359	{
1341	make_current ();	1360	make_current ();
1342		1361
1343	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1446	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1447	{	1466	{
1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449	;	1468	;
1450		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1451	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1452	bool moved = false;
1453	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1454	{	1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1455	int x, y;	1484	int x, y;
		1485
1456	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1457	{	1487	{
1458	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1459	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1460	}	1490	}
1461	else	1491	else
1462	get_window_origin (x, y);	1492	get_window_origin (x, y);
1463		1493
1464	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1465	\|\| !(bg_flags & BG_IS_VALID))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1466	moved = true;	1499	moved = true;
		1500	}
1467	}	1501	}
1468	#endif
1469		1502
1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1471	{	1504	{
1472	seen_resize = 1;	1505	seen_resize = 1;
1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1496	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1497	break;	1530	break;
1498		1531
1499	case MapNotify:	1532	case MapNotify:
1500	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1501	/* This is needed specifically to fix the case of no window manager or a	1534	// This is needed at startup for the case of no window manager
1502	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1503	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1504	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1505	* reparenting.	1538	// events at startup when the window manager reparents the
1506	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1507	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1508	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1509	* bit of time for ConfigureNotifies to arrive.
1510	* We should render background PRIOR to drawing any text, but AFTER all
1511	* of ConfigureNotifys for the best results.
1512	*/
1513	if (!(bg_flags & BG_IS_VALID))
1514	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1515	#endif	1543	#endif
1516	mapped = 1;	1544	mapped = 1;
1517	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1518	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1610		1638
1611	#ifdef SELECTION_SCROLLING	1639	#ifdef SELECTION_SCROLLING
1612	if (ev.xbutton.y < int_bwidth	1640	if (ev.xbutton.y < int_bwidth
1613	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1641	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1614	{	1642	{
		1643	page_dirn scroll_selection_dir;
1615	int dist;	1644	int dist;
1616		1645
1617	/* don't clobber the current delay if we are	1646	/* don't clobber the current delay if we are
1618	* already in the middle of scrolling.	1647	* already in the middle of scrolling.
1619	*/	1648	*/
…		…
1634	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1635	}	1664	}
1636	else	1665	else
1637	{	1666	{
1638	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1639	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1640	}	1669	}
1641		1670
1642	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1643	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1644	+ 1;	1673	+ 1;
1645	min_it (scroll_selection_lines,	1674	min_it (scroll_selection_lines,
1646	SELECTION_SCROLL_MAX_LINES);	1675	SELECTION_SCROLL_MAX_LINES);
		1676	scroll_selection_lines *= scroll_selection_dir;
1647	}	1677	}
1648	else	1678	else
1649	{	1679	{
1650	/* we are within the text window, so we	1680	/* we are within the text window, so we
1651	* shouldn't be scrolling	1681	* shouldn't be scrolling
…		…
1676	}	1706	}
1677	break;	1707	break;
1678	}	1708	}
1679		1709
1680	#if defined(CURSOR_BLINK)	1710	#if defined(CURSOR_BLINK)
1681	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1711	if (ev.type == KeyPress)
1682	{
1683	if (hidden_cursor)
1684	{
1685	hidden_cursor = 0;
1686	want_refresh = 1;
1687	}
1688
1689	cursor_blink_ev.again ();	1712	cursor_blink_reset ();
1690	}
1691	#endif	1713	#endif
1692		1714
1693	#if defined(POINTER_BLANK)	1715	#if defined(POINTER_BLANK)
1694	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1716	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695	{	1717	{
…		…
1706		1728
1707	refresh_check ();	1729	refresh_check ();
1708	}	1730	}
1709		1731
1710	#if ENABLE_FRILLS	1732	#if ENABLE_FRILLS
1711	void	1733	void ecb_cold
1712	rxvt_term::set_urgency (bool enable)	1734	rxvt_term::set_urgency (bool enable)
1713	{	1735	{
1714	if (enable == urgency_hint)	1736	if (enable == urgency_hint)
1715	return;	1737	return;
1716		1738
…		…
1722	XFree (h);	1744	XFree (h);
1723	}	1745	}
1724	}	1746	}
1725	#endif	1747	#endif
1726		1748
1727	void	1749	void ecb_cold
1728	rxvt_term::focus_in ()	1750	rxvt_term::focus_in ()
1729	{	1751	{
1730	if (!focus)	1752	if (!focus)
1731	{	1753	{
1732	focus = 1;	1754	focus = 1;
…		…
1757		1779
1758	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1780	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759	}	1781	}
1760	}	1782	}
1761		1783
1762	void	1784	void ecb_cold
1763	rxvt_term::focus_out ()	1785	rxvt_term::focus_out ()
1764	{	1786	{
1765	if (focus)	1787	if (focus)
1766	{	1788	{
1767	focus = 0;	1789	focus = 0;
…		…
1800		1822
1801	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1823	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1802	}	1824	}
1803	}	1825	}
1804		1826
1805	void	1827	void ecb_cold
1806	rxvt_term::update_fade_color (unsigned int idx)	1828	rxvt_term::update_fade_color (unsigned int idx)
1807	{	1829	{
1808	#if OFF_FOCUS_FADING	1830	#if OFF_FOCUS_FADING
1809	if (rs[Rs_fade])	1831	if (rs[Rs_fade])
1810	{	1832	{
…		…
1813	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1835	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1814	}	1836	}
1815	#endif	1837	#endif
1816	}	1838	}
1817		1839
1818	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1840	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1819	void	1841	void ecb_hot
1820	rxvt_term::rootwin_cb (XEvent &ev)	1842	rxvt_term::rootwin_cb (XEvent &ev)
1821	{	1843	{
1822	make_current ();	1844	make_current ();
1823		1845
1824	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1846	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1825	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1847	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1826	return;	1848	return;
1827		1849
1828	# if ENABLE_TRANSPARENCY
1829	switch (ev.type)	1850	switch (ev.type)
1830	{	1851	{
1831	case PropertyNotify:	1852	case PropertyNotify:
1832	/*	1853	/*
1833	* if user used some Esetroot compatible prog to set the root bg,	1854	* if user used some Esetroot compatible prog to set the root bg,
1834	* use the property to determine the pixmap. We use it later on.	1855	* use the property to determine the pixmap. We use it later on.
1835	*/	1856	*/
1836	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1857	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1837	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1858	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1838	{	1859	{
1839	bg_set_root_pixmap ();	1860	#if BG_IMAGE_FROM_ROOT
		1861	if (option (Opt_transparent))
		1862	{
		1863	rxvt_img::new_from_root (this)->replace (root_img);
1840	update_background ();	1864	update_background ();
		1865	}
		1866	#endif
		1867	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1841	}	1868	}
1842		1869
1843	break;	1870	break;
1844	}	1871	}
1845	# endif
1846		1872
1847	refresh_check ();	1873	refresh_check ();
1848	}	1874	}
1849	#endif	1875	#endif
1850		1876
…		…
2163	case Button3:	2189	case Button3:
2164	selection_make (ev.time);	2190	selection_make (ev.time);
2165	break;	2191	break;
2166		2192
2167	case Button2:	2193	case Button2:
2168	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2194	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2195	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170	break;	2196	break;
2171		2197
2172	#ifdef MOUSE_WHEEL	2198	#ifdef MOUSE_WHEEL
2173	case Button4:	2199	case Button4:
2174	case Button5:	2200	case Button5:
2175	{	2201	{
2176	int i;	2202	int lines;
2177	page_dirn v;	2203	page_dirn dirn;
2178		2204
2179	v = ev.button == Button4 ? UP : DN;	2205	dirn = ev.button == Button4 ? UP : DN;
2180		2206
2181	if (ev.state & ShiftMask)	2207	if (ev.state & ShiftMask)
2182	i = 1;	2208	lines = 1;
2183	else if (option (Opt_mouseWheelScrollPage))	2209	else if (option (Opt_mouseWheelScrollPage))
2184	i = nrow - 1;	2210	lines = nrow - 1;
2185	else	2211	else
2186	i = 5;	2212	lines = 5;
2187		2213
2188	# ifdef MOUSE_SLIP_WHEELING	2214	# ifdef MOUSE_SLIP_WHEELING
2189	if (ev.state & ControlMask)	2215	if (ev.state & ControlMask)
2190	{	2216	{
2191	mouse_slip_wheel_speed += v ? -1 : 1;	2217	mouse_slip_wheel_speed += dirn;
2192	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2218	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2193	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194		2219
2195	if (!slip_wheel_ev.is_active ())	2220	if (!slip_wheel_ev.is_active ())
2196	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2221	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197	}	2222	}
2198	else	2223	else
2199	# endif	2224	# endif
2200	{	2225	{
2201	scr_page (v, i);	2226	scr_page (dirn, lines);
2202	scrollBar.show (1);	2227	scrollBar.show (1);
2203	}	2228	}
2204	}	2229	}
2205	break;	2230	break;
2206	#endif	2231	#endif
…		…
2208	}	2233	}
2209	}	2234	}
2210		2235
2211	/}}} /	2236	/}}} /
2212		2237
2213	void	2238	void ecb_hot
2214	rxvt_term::cmd_parse ()	2239	rxvt_term::cmd_parse ()
2215	{	2240	{
2216	wchar_t ch = NOCHAR;	2241	wchar_t ch = NOCHAR;
2217	char *seq_begin; // remember start of esc-sequence here	2242	char *seq_begin; // remember start of esc-sequence here
2218		2243
…		…
2337	}	2362	}
2338	}	2363	}
2339	}	2364	}
2340		2365
2341	// read the next character	2366	// read the next character
2342	wchar_t	2367	wchar_t ecb_hot
2343	rxvt_term::next_char () NOTHROW	2368	rxvt_term::next_char () NOTHROW
2344	{	2369	{
2345	while (cmdbuf_ptr < cmdbuf_endp)	2370	while (cmdbuf_ptr < cmdbuf_endp)
2346	{	2371	{
2347	// assume 7-bit to be ascii ALWAYS	2372	// assume 7-bit to be ascii ALWAYS
…		…
2359	}	2384	}
2360		2385
2361	if (len == (size_t)-1)	2386	if (len == (size_t)-1)
2362	{	2387	{
2363	mbstate.reset (); // reset now undefined conversion state	2388	mbstate.reset (); // reset now undefined conversion state
		2389	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2390	// in which case we "erroneously" return the next byte which might be valid.
2364	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2391	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365	}	2392	}
2366		2393
2367	// assume wchar == unicode	2394	// assume wchar == unicode
2368	cmdbuf_ptr += len;	2395	cmdbuf_ptr += len;
…		…
2371		2398
2372	return NOCHAR;	2399	return NOCHAR;
2373	}	2400	}
2374		2401
2375	// read the next octet	2402	// read the next octet
2376	uint32_t	2403	uint32_t ecb_hot
2377	rxvt_term::next_octet () NOTHROW	2404	rxvt_term::next_octet () NOTHROW
2378	{	2405	{
2379	return cmdbuf_ptr < cmdbuf_endp	2406	return cmdbuf_ptr < cmdbuf_endp
2380	? (unsigned char)*cmdbuf_ptr++	2407	? (unsigned char)*cmdbuf_ptr++
2381	: NOCHAR;	2408	: NOCHAR;
2382	}	2409	}
2383		2410
2384	static class out_of_input out_of_input;	2411	static class out_of_input out_of_input;
2385		2412
2386	wchar_t	2413	wchar_t ecb_hot
2387	rxvt_term::cmd_getc () THROW ((class out_of_input))	2414	rxvt_term::cmd_getc () THROW ((class out_of_input))
2388	{	2415	{
2389	wchar_t c = next_char ();	2416	wchar_t c = next_char ();
2390		2417
2391	if (c == NOCHAR)	2418	if (c == NOCHAR)
2392	throw out_of_input;	2419	throw out_of_input;
2393		2420
2394	return c;	2421	return c;
2395	}	2422	}
2396		2423
2397	uint32_t	2424	uint32_t ecb_hot
2398	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2425	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2399	{	2426	{
2400	uint32_t c = next_octet ();	2427	uint32_t c = next_octet ();
2401		2428
2402	if (c == NOCHAR)	2429	if (c == NOCHAR)
…		…
2406	}	2433	}
2407		2434
2408	/{{{ print pipe /	2435	/{{{ print pipe /
2409	/----------------------------------------------------------------------/	2436	/----------------------------------------------------------------------/
2410	#ifdef PRINTPIPE	2437	#ifdef PRINTPIPE
2411	FILE *	2438	FILE * ecb_cold
2412	rxvt_term::popen_printer ()	2439	rxvt_term::popen_printer ()
2413	{	2440	{
2414	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2441	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2415		2442
2416	if (stream == NULL)	2443	if (stream == NULL)
2417	rxvt_warn ("can't open printer pipe, not printing.\n");	2444	rxvt_warn ("can't open printer pipe, not printing.\n");
2418		2445
2419	return stream;	2446	return stream;
2420	}	2447	}
2421		2448
2422	int	2449	int ecb_cold
2423	rxvt_term::pclose_printer (FILE *stream)	2450	rxvt_term::pclose_printer (FILE *stream)
2424	{	2451	{
2425	fflush (stream);	2452	fflush (stream);
2426	return pclose (stream);	2453	return pclose (stream);
2427	}	2454	}
2428		2455
2429	/*	2456	/*
2430	* simulate attached vt100 printer	2457	* simulate attached vt100 printer
2431	*/	2458	*/
2432	void	2459	void ecb_cold
2433	rxvt_term::process_print_pipe ()	2460	rxvt_term::process_print_pipe ()
2434	{	2461	{
2435	FILE *fd = popen_printer ();	2462	FILE *fd = popen_printer ();
2436		2463
2437	if (!fd)	2464	if (!fd)
…		…
2492	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2519	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2493	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2520	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2494	};	2521	};
2495		2522
2496	/{{{ process non-printing single characters /	2523	/{{{ process non-printing single characters /
2497	void	2524	void ecb_hot
2498	rxvt_term::process_nonprinting (unicode_t ch)	2525	rxvt_term::process_nonprinting (unicode_t ch)
2499	{	2526	{
2500	switch (ch)	2527	switch (ch)
2501	{	2528	{
2502	case C0_ESC:	2529	case C0_ESC:
…		…
2548	}	2575	}
2549	/}}} /	2576	/}}} /
2550		2577
2551		2578
2552	/{{{ process VT52 escape sequences /	2579	/{{{ process VT52 escape sequences /
2553	void	2580	void ecb_cold
2554	rxvt_term::process_escape_vt52 (unicode_t ch)	2581	rxvt_term::process_escape_vt52 (unicode_t ch)
2555	{	2582	{
2556	int row, col;	2583	int row, col;
2557		2584
2558	switch (ch)	2585	switch (ch)
…		…
2608	}	2635	}
2609	/}}} /	2636	/}}} /
2610		2637
2611		2638
2612	/{{{ process escape sequences /	2639	/{{{ process escape sequences /
2613	void	2640	void ecb_hot
2614	rxvt_term::process_escape_seq ()	2641	rxvt_term::process_escape_seq ()
2615	{	2642	{
2616	unicode_t ch = cmd_getc ();	2643	unicode_t ch = cmd_getc ();
2617		2644
2618	if (priv_modes & PrivMode_vt52)	2645	if (priv_modes & PrivMode_vt52)
…		…
2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2797	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2798	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2799	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2773	};	2800	};
2774		2801
2775	void	2802	void ecb_hot
2776	rxvt_term::process_csi_seq ()	2803	rxvt_term::process_csi_seq ()
2777	{	2804	{
2778	unicode_t ch, priv, i;	2805	unicode_t ch, priv, prev_ch, i;
2779	unsigned int nargs, p;	2806	unsigned int nargs, p;
2780	int n, ndef;	2807	int n, ndef;
2781	int arg[ESC_ARGS] = { };	2808	int arg[ESC_ARGS] = { };
2782		2809
2783	nargs = 0;	2810	nargs = 0;
…		…
2789	/* '<' '=' '>' '?' '!' */	2816	/* '<' '=' '>' '?' '!' */
2790	priv = ch;	2817	priv = ch;
2791	ch = cmd_getc ();	2818	ch = cmd_getc ();
2792	}	2819	}
2793		2820
		2821	prev_ch = 0;
2794	/* read any numerical arguments */	2822	/* read any numerical arguments */
2795	for (n = -1; ch < CSI_ICH; )	2823	for (n = -1; ch < CSI_ICH; )
2796	{	2824	{
2797	if (isdigit (ch))	2825	if (isdigit (ch))
2798	{	2826	{
…		…
2808	n = -1;	2836	n = -1;
2809	}	2837	}
2810	else if (IS_CONTROL (ch))	2838	else if (IS_CONTROL (ch))
2811	process_nonprinting (ch);	2839	process_nonprinting (ch);
2812		2840
		2841	prev_ch = ch;
2813	ch = cmd_getc ();	2842	ch = cmd_getc ();
2814	}	2843	}
2815		2844
2816	if (ch > CSI_7F)	2845	if (ch > CSI_7F)
2817	return;	2846	return;
…		…
3051	scr_insert_mode (1);	3080	scr_insert_mode (1);
3052	else if (arg[0] == 20)	3081	else if (arg[0] == 20)
3053	priv_modes \|= PrivMode_LFNL;	3082	priv_modes \|= PrivMode_LFNL;
3054	break;	3083	break;
3055		3084
		3085	case CSI_71: // DESCUSR: set cursor style
		3086	if (prev_ch == ' ')
		3087	set_cursor_style (arg[0]);
		3088	break;
		3089
3056	/*	3090	/*
3057	* PRIVATE USE beyond this point. All CSI_7? sequences here	3091	* PRIVATE USE beyond this point. All CSI_7? sequences here
3058	*/	3092	*/
3059	case CSI_72: /* DECSTBM: set top and bottom margins */	3093	case CSI_72: /* DECSTBM: set top and bottom margins */
3060	if (nargs == 1)	3094	if (nargs == 1)
…		…
3134	break;	3168	break;
3135		3169
3136	//case 9: NYI, TODO, restore maximized window or maximize window	3170	//case 9: NYI, TODO, restore maximized window or maximize window
3137	default:	3171	default:
3138	if (args[0] >= 24) /* set height (chars) */	3172	if (args[0] >= 24) /* set height (chars) */
3139	set_widthheight ((unsigned int)width,	3173	set_widthheight ((unsigned int)vt_width,
3140	(unsigned int) (args[1] * fheight));	3174	(unsigned int) (args[1] * fheight));
3141	break;	3175	break;
3142		3176
3143	/*	3177	/*
3144	* reports - some output format copied from XTerm	3178	* reports - some output format copied from XTerm
…		…
3423	break;	3457	break;
3424	#endif	3458	#endif
3425	case URxvt_Color_border:	3459	case URxvt_Color_border:
3426	process_color_seq (op, Color_border, str, resp);	3460	process_color_seq (op, Color_border, str, resp);
3427	break;	3461	break;
3428	#if ENABLE_TRANSPARENCY	3462
		3463	#if BG_IMAGE_FROM_ROOT
3429	case URxvt_Color_tint:	3464	case URxvt_Color_tint:
3430	process_color_seq (op, Color_tint, str, resp);	3465	process_color_seq (op, Color_tint, str, resp);
3431	{	3466	{
3432	bool changed = false;	3467	bool changed = false;
3433		3468
3434	if (ISSET_PIXCOLOR (Color_tint))	3469	if (ISSET_PIXCOLOR (Color_tint))
3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3470	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436		3471
3437	if (changed)	3472	if (changed)
3438	update_background ();	3473	update_background ();
3439	}	3474	}
3440		3475
…		…
3444	#if BG_IMAGE_FROM_FILE	3479	#if BG_IMAGE_FROM_FILE
3445	case Rxvt_Pixmap:	3480	case Rxvt_Pixmap:
3446	if (!strcmp (str, "?"))	3481	if (!strcmp (str, "?"))
3447	{	3482	{
3448	char str[256];	3483	char str[256];
		3484	int h_scale = fimage.h_scale;
		3485	int v_scale = fimage.v_scale;
		3486	int h_align = fimage.h_align;
		3487	int v_align = fimage.v_align;
3449		3488
3450	sprintf (str, "[%dx%d+%d+%d]",	3489	sprintf (str, "[%dx%d+%d+%d]",
3451	min (h_scale, 32767), min (v_scale, 32767),	3490	h_scale, v_scale,
3452	min (h_align, 32767), min (v_align, 32767));	3491	h_align, v_align);
3453	process_xterm_seq (XTerm_title, str, CHAR_ST);	3492	process_xterm_seq (XTerm_title, str, CHAR_ST);
3454	}	3493	}
3455	else	3494	else
3456	{	3495	{
3457	bool changed = false;	3496	bool changed = false;
3458		3497
3459	if (*str != ';')	3498	if (*str != ';')
3460	{	3499	{
3461	if (bg_set_file (str)) /* change pixmap */	3500	try
		3501	{
		3502	fimage.set_file_geometry (this, str);
3462	changed = true;	3503	changed = true;
		3504	}
		3505	catch (const class rxvt_failure_exception &e)
		3506	{
		3507	}
3463	}	3508	}
3464	else	3509	else
3465	{	3510	{
3466	str++;	3511	str++;
3467	if (bg_set_geometry (str, true))	3512	if (fimage.set_geometry (str, true))
3468	changed = true;	3513	changed = true;
3469	}	3514	}
3470		3515
3471	if (changed)	3516	if (changed)
3472	{	3517	{
3473	if (bg_window_position_sensitive ())	3518	if (bg_window_position_sensitive ())
3474	{	3519	{
3475	int x, y;	3520	int x, y;
3476	get_window_origin (x, y);	3521	get_window_origin (x, y);
3477	bg_set_position (x, y);	3522	parent_x = x;
		3523	parent_y = y;
3478	}	3524	}
3479	update_background ();	3525	update_background ();
3480	}	3526	}
3481	}	3527	}
3482	break;	3528	break;
…		…
3572	* 's' = save	3618	* 's' = save
3573	* 'r' = restore	3619	* 'r' = restore
3574	* 't' = toggle	3620	* 't' = toggle
3575	* so no need for fancy checking	3621	* so no need for fancy checking
3576	*/	3622	*/
3577	int	3623	int ecb_cold
3578	rxvt_term::privcases (int mode, unsigned long bit)	3624	rxvt_term::privcases (int mode, unsigned long bit)
3579	{	3625	{
3580	int state;	3626	int state;
3581		3627
3582	if (mode == 's')	3628	if (mode == 's')
3583	{	3629	{
3584	SavedModes \|= (priv_modes & bit);	3630	if (priv_modes & bit)
		3631	SavedModes \|= bit;
		3632	else
		3633	SavedModes &= ~bit;
3585	return -1;	3634	return -1;
3586	}	3635	}
3587	else	3636	else
3588	{	3637	{
3589	if (mode == 'r')	3638	if (mode == 'r')
…		…
3799	}	3848	}
3800	}	3849	}
3801	/}}} /	3850	/}}} /
3802		3851
3803	/{{{ process sgr sequences /	3852	/{{{ process sgr sequences /
3804	void	3853	void ecb_hot
3805	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3854	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3806	{	3855	{
3807	unsigned int i;	3856	unsigned int i;
3808	short rendset;	3857	short rendset;
3809	int rendstyle;	3858	int rendstyle;
…		…
3950	break;	3999	break;
3951	#endif	4000	#endif
3952	}	4001	}
3953	}	4002	}
3954	}	4003	}
		4004
		4005	void
		4006	rxvt_term::set_cursor_style (int style)
		4007	{
		4008	if (!IN_RANGE_INC (style, 0, 4))
		4009	return;
		4010
		4011	set_option (Opt_cursorUnderline, style >= 3);
		4012
		4013	#ifdef CURSOR_BLINK
		4014	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4015	cursor_blink_reset ();
		4016	#endif
		4017
		4018	want_refresh = 1;
		4019	}
3955	/}}} /	4020	/}}} /
3956		4021
3957	/* ------------------------------------------------------------------------- */	4022	/* ------------------------------------------------------------------------- */
3958		4023
3959	/*	4024	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs. Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs.
Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 2013 UTC