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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 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
…		…
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;
…		…
421	ctrl = ev.state & ControlMask;	434	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	435	meta = ev.state & ModMetaMask;
423		436
424	kbuf[0] = 0;	437	kbuf[0] = 0;
425		438
426	#ifdef USE_XIM	439	#if USE_XIM
427	if (Input_Context)	440	if (Input_Context)
428	{	441	{
429	Status status_return;	442	Status status_return;
430		443
431	#if 0	444	#if 0
…		…
506	#endif	519	#endif
507	max_it (lnsppg, 1);	520	max_it (lnsppg, 1);
508		521
509	if (keysym == XK_Prior)	522	if (keysym == XK_Prior)
510	{	523	{
511	scr_page (UP, lnsppg);	524	scr_page (lnsppg);
512	return;	525	return;
513	}	526	}
514	else if (keysym == XK_Next)	527	else if (keysym == XK_Next)
515	{	528	{
516	scr_page (DN, lnsppg);	529	scr_page (-lnsppg);
517	return;	530	return;
518	}	531	}
519	}	532	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	533	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	534	if (IS_SCROLL_MOD)
522	{	535	{
523	if (keysym == XK_Up)	536	if (keysym == XK_Up)
524	{	537	{
525	scr_page (UP, 1);	538	scr_page (1);
526	return;	539	return;
527	}	540	}
528	else if (keysym == XK_Down)	541	else if (keysym == XK_Down)
529	{	542	{
530	scr_page (DN, 1);	543	scr_page (-1);
531	return;	544	return;
532	}	545	}
533	}	546	}
534	#endif	547	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	548	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	549	if (IS_SCROLL_MOD)
537	{	550	{
538	if (keysym == XK_Home)	551	if (keysym == XK_Home)
539	{	552	{
540	scr_move_to (0, 1);	553	scr_changeview (top_row);
541	return;	554	return;
542	}	555	}
543	else if (keysym == XK_End)	556	else if (keysym == XK_End)
544	{	557	{
545	scr_move_to (1, 1);	558	scr_changeview (0);
546	return;	559	return;
547	}	560	}
548	}	561	}
549	#endif	562	#endif
550	}	563	}
…		…
572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	585	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573	return;	586	return;
574	#endif	587	#endif
575	}	588	}
576	}	589	}
		590	}
		591
		592	if (ctrl && meta && (keysym == XK_c \|\| keysym == XK_v))
		593	{
		594	if (keysym == XK_v)
		595	selection_request (ev.time, Sel_Clipboard);
		596	else if (selection.len > 0)
		597	{
		598	free (selection.clip_text);
		599	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		600	selection.clip_len = selection.len;
		601	selection_grab (CurrentTime, true);
		602	}
		603
		604	return;
577	}	605	}
578		606
579	#if ENABLE_FRILLS \|\| ISO_14755	607	#if ENABLE_FRILLS \|\| ISO_14755
580	// ISO 14755 support	608	// ISO 14755 support
581	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))	609	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_51))
…		…
855	}	883	}
856		884
857	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
858	}	886	}
859		887
860	void	888	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	889	rxvt_term::key_release (XKeyEvent &ev)
862	{	890	{
863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	891	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
864	KeySym keysym;	892	KeySym keysym;
865		893
…		…
937	void	965	void
938	rxvt_term::flush ()	966	rxvt_term::flush ()
939	{	967	{
940	flush_ev.stop ();	968	flush_ev.stop ();
941		969
942	#ifdef HAVE_BG_PIXMAP	970	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	971	if (bg_flags & BG_NEEDS_REFRESH)
944	{	972	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	973	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	974	scr_touch (false);
947	}	975	}
…		…
987	while (row < end_row);	1015	while (row < end_row);
988	}	1016	}
989		1017
990	scr_refresh ();	1018	scr_refresh ();
991	scrollBar.show (1);	1019	scrollBar.show (1);
992	#ifdef USE_XIM	1020	#if USE_XIM
993	im_send_spot ();	1021	im_send_spot ();
994	#endif	1022	#endif
995	}	1023	}
996		1024
997	display->flush ();	1025	display->flush ();
…		…
1073		1101
1074	#ifdef SELECTION_SCROLLING	1102	#ifdef SELECTION_SCROLLING
1075	void	1103	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1104	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1105	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1106	if (scr_page (scroll_selection_lines))
1079	{	1107	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1108	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1109	want_refresh = 1;
1082	refresh_check ();	1110	refresh_check ();
1083	}	1111	}
…		…
1088		1116
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1117	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1118	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1119	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1120	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1121	if (scr_page (mouse_slip_wheel_speed))
1094	{	1122	{
1095	want_refresh = 1;	1123	want_refresh = 1;
1096	refresh_check ();	1124	refresh_check ();
1097	}	1125	}
1098		1126
…		…
1219	pty_write ();	1247	pty_write ();
1220		1248
1221	refresh_check ();	1249	refresh_check ();
1222	}	1250	}
1223		1251
1224	void	1252	void ecb_cold
1225	rxvt_term::pointer_unblank ()	1253	rxvt_term::pointer_unblank ()
1226	{	1254	{
1227	XDefineCursor (dpy, vt, TermWin_cursor);	1255	XDefineCursor (dpy, vt, TermWin_cursor);
1228	recolour_cursor ();	1256	recolour_cursor ();
1229		1257
…		…
1234	pointer_ev.start (pointerBlankDelay);	1262	pointer_ev.start (pointerBlankDelay);
1235	#endif	1263	#endif
1236	}	1264	}
1237		1265
1238	#ifdef POINTER_BLANK	1266	#ifdef POINTER_BLANK
1239	void	1267	void ecb_cold
1240	rxvt_term::pointer_blank ()	1268	rxvt_term::pointer_blank ()
1241	{	1269	{
1242	if (!option (Opt_pointerBlank))	1270	if (!option (Opt_pointerBlank))
1243	return;	1271	return;
1244		1272
…		…
1246	XFlush (dpy);	1274	XFlush (dpy);
1247		1275
1248	hidden_pointer = 1;	1276	hidden_pointer = 1;
1249	}	1277	}
1250		1278
1251	void	1279	void ecb_cold
1252	rxvt_term::pointer_cb (ev::timer &w, int revents)	1280	rxvt_term::pointer_cb (ev::timer &w, int revents)
1253	{	1281	{
1254	make_current ();	1282	make_current ();
1255		1283
1256	pointer_blank ();	1284	pointer_blank ();
…		…
1348	32 + x,	1376	32 + x,
1349	32 + y);	1377	32 + y);
1350	}	1378	}
1351		1379
1352	/{{{ process an X event /	1380	/{{{ process an X event /
1353	void	1381	void ecb_hot
1354	rxvt_term::x_cb (XEvent &ev)	1382	rxvt_term::x_cb (XEvent &ev)
1355	{	1383	{
1356	make_current ();	1384	make_current ();
1357		1385
1358	dLocal (Display *, dpy);	1386	dLocal (Display *, dpy);
…		…
1461	if (ev.xconfigure.window == parent)	1489	if (ev.xconfigure.window == parent)
1462	{	1490	{
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1492	;
1465		1493
		1494	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1495
		1496	bool moved = false;
1466	#ifdef HAVE_BG_PIXMAP	1497	#ifdef HAVE_BG_PIXMAP
1467	bool moved = false;
1468	if (bg_window_position_sensitive ())	1498	if (bg_window_position_sensitive ())
1469	{	1499	{
		1500	want_position_change = true;
		1501	if (bg_img == 0)
		1502	moved = true;
		1503	}
		1504	#endif
		1505
		1506	if (want_position_change)
		1507	{
1470	int x, y;	1508	int x, y;
		1509
1471	if (ev.xconfigure.send_event)	1510	if (ev.xconfigure.send_event)
1472	{	1511	{
1473	x = ev.xconfigure.x;	1512	x = ev.xconfigure.x;
1474	y = ev.xconfigure.y;	1513	y = ev.xconfigure.y;
1475	}	1514	}
1476	else	1515	else
1477	get_window_origin (x, y);	1516	get_window_origin (x, y);
1478		1517
1479	if (bg_set_position (x, y)	1518	if (x != parent_x \|\| y != parent_y)
1480	\|\| !(bg_flags & BG_IS_VALID))	1519	{
		1520	parent_x = x;
		1521	parent_y = y;
		1522	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481	moved = true;	1523	moved = true;
		1524	}
1482	}	1525	}
1483	#endif
1484		1526
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1527	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1528	{
1487	seen_resize = 1;	1529	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1511	selection_send (ev.xselectionrequest);	1553	selection_send (ev.xselectionrequest);
1512	break;	1554	break;
1513		1555
1514	case MapNotify:	1556	case MapNotify:
1515	#ifdef HAVE_BG_PIXMAP	1557	#ifdef HAVE_BG_PIXMAP
1516	/* This is needed specifically to fix the case of no window manager or a	1558	// This is needed at startup for the case of no window manager
1517	* non-reparenting window manager. In those cases we never get first	1559	// or a non-reparenting window manager and also because we
1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1560	// defer bg image updates if the window is not mapped. The
1519	* care of multiplicity of ConfigureNotify events arriving while WM does	1561	// short delay is to optimize for multiple ConfigureNotify
1520	* reparenting.	1562	// events at startup when the window manager reparents the
1521	* We should not render background immediately, as there could be several	1563	// window, so as to perform the computation after we have
1522	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1564	// received all of them.
1523	* by scheduling background redraw as soon as we can, but giving a short	1565	if (bg_img == 0)
1524	* bit of time for ConfigureNotifies to arrive.
1525	* We should render background PRIOR to drawing any text, but AFTER all
1526	* of ConfigureNotifys for the best results.
1527	*/
1528	if (!(bg_flags & BG_IS_VALID))
1529	update_background_ev.start (0.025);	1566	update_background_ev.start (0.025);
1530	#endif	1567	#endif
1531	mapped = 1;	1568	mapped = 1;
1532	#ifdef TEXT_BLINK	1569	#ifdef TEXT_BLINK
1533	text_blink_ev.start ();	1570	text_blink_ev.start ();
…		…
1625		1662
1626	#ifdef SELECTION_SCROLLING	1663	#ifdef SELECTION_SCROLLING
1627	if (ev.xbutton.y < int_bwidth	1664	if (ev.xbutton.y < int_bwidth
1628	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1665	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1629	{	1666	{
		1667	page_dirn scroll_selection_dir;
1630	int dist;	1668	int dist;
1631		1669
1632	/* don't clobber the current delay if we are	1670	/* don't clobber the current delay if we are
1633	* already in the middle of scrolling.	1671	* already in the middle of scrolling.
1634	*/	1672	*/
…		…
1657	scroll_selection_lines = Pixel2Height (dist)	1695	scroll_selection_lines = Pixel2Height (dist)
1658	/ SELECTION_SCROLL_LINE_SPEEDUP	1696	/ SELECTION_SCROLL_LINE_SPEEDUP
1659	+ 1;	1697	+ 1;
1660	min_it (scroll_selection_lines,	1698	min_it (scroll_selection_lines,
1661	SELECTION_SCROLL_MAX_LINES);	1699	SELECTION_SCROLL_MAX_LINES);
		1700	scroll_selection_lines *= scroll_selection_dir;
1662	}	1701	}
1663	else	1702	else
1664	{	1703	{
1665	/* we are within the text window, so we	1704	/* we are within the text window, so we
1666	* shouldn't be scrolling	1705	* shouldn't be scrolling
…		…
1713		1752
1714	refresh_check ();	1753	refresh_check ();
1715	}	1754	}
1716		1755
1717	#if ENABLE_FRILLS	1756	#if ENABLE_FRILLS
1718	void	1757	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1758	rxvt_term::set_urgency (bool enable)
1720	{	1759	{
1721	if (enable == urgency_hint)	1760	if (enable == urgency_hint)
1722	return;	1761	return;
1723		1762
…		…
1729	XFree (h);	1768	XFree (h);
1730	}	1769	}
1731	}	1770	}
1732	#endif	1771	#endif
1733		1772
1734	void	1773	void ecb_cold
1735	rxvt_term::focus_in ()	1774	rxvt_term::focus_in ()
1736	{	1775	{
1737	if (!focus)	1776	if (!focus)
1738	{	1777	{
1739	focus = 1;	1778	focus = 1;
…		…
1764		1803
1765	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1804	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766	}	1805	}
1767	}	1806	}
1768		1807
1769	void	1808	void ecb_cold
1770	rxvt_term::focus_out ()	1809	rxvt_term::focus_out ()
1771	{	1810	{
1772	if (focus)	1811	if (focus)
1773	{	1812	{
1774	focus = 0;	1813	focus = 0;
…		…
1807		1846
1808	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1847	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809	}	1848	}
1810	}	1849	}
1811		1850
1812	void	1851	void ecb_cold
1813	rxvt_term::update_fade_color (unsigned int idx)	1852	rxvt_term::update_fade_color (unsigned int idx)
1814	{	1853	{
1815	#if OFF_FOCUS_FADING	1854	#if OFF_FOCUS_FADING
1816	if (rs[Rs_fade])	1855	if (rs[Rs_fade])
1817	{	1856	{
…		…
1820	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1859	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821	}	1860	}
1822	#endif	1861	#endif
1823	}	1862	}
1824		1863
1825	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1864	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1826	void	1865	void ecb_hot
1827	rxvt_term::rootwin_cb (XEvent &ev)	1866	rxvt_term::rootwin_cb (XEvent &ev)
1828	{	1867	{
1829	make_current ();	1868	make_current ();
1830		1869
1831	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1870	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1871	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833	return;	1872	return;
1834		1873
1835	# if ENABLE_TRANSPARENCY
1836	switch (ev.type)	1874	switch (ev.type)
1837	{	1875	{
1838	case PropertyNotify:	1876	case PropertyNotify:
1839	/*	1877	/*
1840	* if user used some Esetroot compatible prog to set the root bg,	1878	* if user used some Esetroot compatible prog to set the root bg,
1841	* use the property to determine the pixmap. We use it later on.	1879	* use the property to determine the pixmap. We use it later on.
1842	*/	1880	*/
1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1881	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1882	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	{	1883	{
1846	bg_set_root_pixmap ();	1884	#if BG_IMAGE_FROM_ROOT
		1885	if (option (Opt_transparent))
		1886	{
		1887	rxvt_img::new_from_root (this)->replace (root_img);
1847	update_background ();	1888	update_background ();
		1889	}
		1890	#endif
		1891	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848	}	1892	}
1849		1893
1850	break;	1894	break;
1851	}	1895	}
1852	# endif
1853		1896
1854	refresh_check ();	1897	refresh_check ();
1855	}	1898	}
1856	#endif	1899	#endif
1857		1900
…		…
2178		2221
2179	#ifdef MOUSE_WHEEL	2222	#ifdef MOUSE_WHEEL
2180	case Button4:	2223	case Button4:
2181	case Button5:	2224	case Button5:
2182	{	2225	{
2183	int i;	2226	int lines;
2184	page_dirn v;	2227	page_dirn dirn;
2185		2228
2186	v = ev.button == Button4 ? UP : DN;	2229	dirn = ev.button == Button4 ? UP : DN;
2187		2230
2188	if (ev.state & ShiftMask)	2231	if (ev.state & ShiftMask)
2189	i = 1;	2232	lines = 1;
2190	else if (option (Opt_mouseWheelScrollPage))	2233	else if (option (Opt_mouseWheelScrollPage))
2191	i = nrow - 1;	2234	lines = nrow - 1;
2192	else	2235	else
2193	i = 5;	2236	lines = 5;
2194		2237
2195	# ifdef MOUSE_SLIP_WHEELING	2238	# ifdef MOUSE_SLIP_WHEELING
2196	if (ev.state & ControlMask)	2239	if (ev.state & ControlMask)
2197	{	2240	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2241	mouse_slip_wheel_speed += dirn;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2242	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2243
2202	if (!slip_wheel_ev.is_active ())	2244	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2245	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204	}	2246	}
2205	else	2247	else
2206	# endif	2248	# endif
2207	{	2249	{
2208	scr_page (v, i);	2250	scr_page (dirn, lines);
2209	scrollBar.show (1);	2251	scrollBar.show (1);
2210	}	2252	}
2211	}	2253	}
2212	break;	2254	break;
2213	#endif	2255	#endif
…		…
2215	}	2257	}
2216	}	2258	}
2217		2259
2218	/}}} /	2260	/}}} /
2219		2261
2220	void	2262	void ecb_hot
2221	rxvt_term::cmd_parse ()	2263	rxvt_term::cmd_parse ()
2222	{	2264	{
2223	wchar_t ch = NOCHAR;	2265	wchar_t ch = NOCHAR;
2224	char *seq_begin; // remember start of esc-sequence here	2266	char *seq_begin; // remember start of esc-sequence here
2225		2267
…		…
2344	}	2386	}
2345	}	2387	}
2346	}	2388	}
2347		2389
2348	// read the next character	2390	// read the next character
2349	wchar_t	2391	wchar_t ecb_hot
2350	rxvt_term::next_char () NOTHROW	2392	rxvt_term::next_char () NOTHROW
2351	{	2393	{
2352	while (cmdbuf_ptr < cmdbuf_endp)	2394	while (cmdbuf_ptr < cmdbuf_endp)
2353	{	2395	{
2354	// assume 7-bit to be ascii ALWAYS	2396	// assume 7-bit to be ascii ALWAYS
…		…
2366	}	2408	}
2367		2409
2368	if (len == (size_t)-1)	2410	if (len == (size_t)-1)
2369	{	2411	{
2370	mbstate.reset (); // reset now undefined conversion state	2412	mbstate.reset (); // reset now undefined conversion state
		2413	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2414	// in which case we "erroneously" return the next byte which might be valid.
2371	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2415	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372	}	2416	}
2373		2417
2374	// assume wchar == unicode	2418	// assume wchar == unicode
2375	cmdbuf_ptr += len;	2419	cmdbuf_ptr += len;
…		…
2378		2422
2379	return NOCHAR;	2423	return NOCHAR;
2380	}	2424	}
2381		2425
2382	// read the next octet	2426	// read the next octet
2383	uint32_t	2427	uint32_t ecb_hot
2384	rxvt_term::next_octet () NOTHROW	2428	rxvt_term::next_octet () NOTHROW
2385	{	2429	{
2386	return cmdbuf_ptr < cmdbuf_endp	2430	return cmdbuf_ptr < cmdbuf_endp
2387	? (unsigned char)*cmdbuf_ptr++	2431	? (unsigned char)*cmdbuf_ptr++
2388	: NOCHAR;	2432	: NOCHAR;
2389	}	2433	}
2390		2434
2391	static class out_of_input out_of_input;	2435	static class out_of_input out_of_input;
2392		2436
2393	wchar_t	2437	wchar_t ecb_hot
2394	rxvt_term::cmd_getc () THROW ((class out_of_input))	2438	rxvt_term::cmd_getc () THROW ((class out_of_input))
2395	{	2439	{
2396	wchar_t c = next_char ();	2440	wchar_t c = next_char ();
2397		2441
2398	if (c == NOCHAR)	2442	if (c == NOCHAR)
2399	throw out_of_input;	2443	throw out_of_input;
2400		2444
2401	return c;	2445	return c;
2402	}	2446	}
2403		2447
2404	uint32_t	2448	uint32_t ecb_hot
2405	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2449	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2406	{	2450	{
2407	uint32_t c = next_octet ();	2451	uint32_t c = next_octet ();
2408		2452
2409	if (c == NOCHAR)	2453	if (c == NOCHAR)
…		…
2413	}	2457	}
2414		2458
2415	/{{{ print pipe /	2459	/{{{ print pipe /
2416	/----------------------------------------------------------------------/	2460	/----------------------------------------------------------------------/
2417	#ifdef PRINTPIPE	2461	#ifdef PRINTPIPE
2418	FILE *	2462	FILE * ecb_cold
2419	rxvt_term::popen_printer ()	2463	rxvt_term::popen_printer ()
2420	{	2464	{
2421	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2465	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2422		2466
2423	if (stream == NULL)	2467	if (stream == NULL)
2424	rxvt_warn ("can't open printer pipe, not printing.\n");	2468	rxvt_warn ("can't open printer pipe, not printing.\n");
2425		2469
2426	return stream;	2470	return stream;
2427	}	2471	}
2428		2472
2429	int	2473	int ecb_cold
2430	rxvt_term::pclose_printer (FILE *stream)	2474	rxvt_term::pclose_printer (FILE *stream)
2431	{	2475	{
2432	fflush (stream);	2476	fflush (stream);
2433	return pclose (stream);	2477	return pclose (stream);
2434	}	2478	}
2435		2479
2436	/*	2480	/*
2437	* simulate attached vt100 printer	2481	* simulate attached vt100 printer
2438	*/	2482	*/
2439	void	2483	void ecb_cold
2440	rxvt_term::process_print_pipe ()	2484	rxvt_term::process_print_pipe ()
2441	{	2485	{
2442	FILE *fd = popen_printer ();	2486	FILE *fd = popen_printer ();
2443		2487
2444	if (!fd)	2488	if (!fd)
…		…
2499	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2543	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2544	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501	};	2545	};
2502		2546
2503	/{{{ process non-printing single characters /	2547	/{{{ process non-printing single characters /
2504	void	2548	void ecb_hot
2505	rxvt_term::process_nonprinting (unicode_t ch)	2549	rxvt_term::process_nonprinting (unicode_t ch)
2506	{	2550	{
2507	switch (ch)	2551	switch (ch)
2508	{	2552	{
2509	case C0_ESC:	2553	case C0_ESC:
…		…
2555	}	2599	}
2556	/}}} /	2600	/}}} /
2557		2601
2558		2602
2559	/{{{ process VT52 escape sequences /	2603	/{{{ process VT52 escape sequences /
2560	void	2604	void ecb_cold
2561	rxvt_term::process_escape_vt52 (unicode_t ch)	2605	rxvt_term::process_escape_vt52 (unicode_t ch)
2562	{	2606	{
2563	int row, col;	2607	int row, col;
2564		2608
2565	switch (ch)	2609	switch (ch)
…		…
2615	}	2659	}
2616	/}}} /	2660	/}}} /
2617		2661
2618		2662
2619	/{{{ process escape sequences /	2663	/{{{ process escape sequences /
2620	void	2664	void ecb_hot
2621	rxvt_term::process_escape_seq ()	2665	rxvt_term::process_escape_seq ()
2622	{	2666	{
2623	unicode_t ch = cmd_getc ();	2667	unicode_t ch = cmd_getc ();
2624		2668
2625	if (priv_modes & PrivMode_vt52)	2669	if (priv_modes & PrivMode_vt52)
…		…
2777	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2821	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2822	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2823	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2780	};	2824	};
2781		2825
2782	void	2826	void ecb_hot
2783	rxvt_term::process_csi_seq ()	2827	rxvt_term::process_csi_seq ()
2784	{	2828	{
2785	unicode_t ch, priv, i;	2829	unicode_t ch, priv, prev_ch, i;
2786	unsigned int nargs, p;	2830	unsigned int nargs, p;
2787	int n, ndef;	2831	int n, ndef;
2788	int arg[ESC_ARGS] = { };	2832	int arg[ESC_ARGS] = { };
2789		2833
2790	nargs = 0;	2834	nargs = 0;
…		…
2796	/* '<' '=' '>' '?' '!' */	2840	/* '<' '=' '>' '?' '!' */
2797	priv = ch;	2841	priv = ch;
2798	ch = cmd_getc ();	2842	ch = cmd_getc ();
2799	}	2843	}
2800		2844
		2845	prev_ch = 0;
2801	/* read any numerical arguments */	2846	/* read any numerical arguments */
2802	for (n = -1; ch < CSI_ICH; )	2847	for (n = -1; ch < CSI_ICH; )
2803	{	2848	{
2804	if (isdigit (ch))	2849	if (isdigit (ch))
2805	{	2850	{
…		…
2815	n = -1;	2860	n = -1;
2816	}	2861	}
2817	else if (IS_CONTROL (ch))	2862	else if (IS_CONTROL (ch))
2818	process_nonprinting (ch);	2863	process_nonprinting (ch);
2819		2864
		2865	prev_ch = ch;
2820	ch = cmd_getc ();	2866	ch = cmd_getc ();
2821	}	2867	}
2822		2868
2823	if (ch > CSI_7F)	2869	if (ch > CSI_7F)
2824	return;	2870	return;
…		…
3058	scr_insert_mode (1);	3104	scr_insert_mode (1);
3059	else if (arg[0] == 20)	3105	else if (arg[0] == 20)
3060	priv_modes \|= PrivMode_LFNL;	3106	priv_modes \|= PrivMode_LFNL;
3061	break;	3107	break;
3062		3108
		3109	case CSI_71: // DESCUSR: set cursor style
		3110	if (prev_ch == ' ')
		3111	set_cursor_style (arg[0]);
		3112	break;
		3113
3063	/*	3114	/*
3064	* PRIVATE USE beyond this point. All CSI_7? sequences here	3115	* PRIVATE USE beyond this point. All CSI_7? sequences here
3065	*/	3116	*/
3066	case CSI_72: /* DECSTBM: set top and bottom margins */	3117	case CSI_72: /* DECSTBM: set top and bottom margins */
3067	if (nargs == 1)	3118	if (nargs == 1)
…		…
3200	rxvt_term::get_to_st (unicode_t &ends_how)	3251	rxvt_term::get_to_st (unicode_t &ends_how)
3201	{	3252	{
3202	unicode_t ch;	3253	unicode_t ch;
3203	bool seen_esc = false;	3254	bool seen_esc = false;
3204	unsigned int n = 0;	3255	unsigned int n = 0;
3205	wchar_t string[STRING_MAX];	3256	wchar_t string[CBUFSIZ];
3206		3257
3207	while ((ch = cmd_getc ()) != NOCHAR)	3258	while ((ch = cmd_getc ()) != NOCHAR)
3208	{	3259	{
3209	if (seen_esc)	3260	if (seen_esc)
3210	{	3261	{
…		…
3225	else if (ch < 0x20)	3276	else if (ch < 0x20)
3226	return NULL; /* other control character - exit */	3277	return NULL; /* other control character - exit */
3227		3278
3228	seen_esc = false;	3279	seen_esc = false;
3229		3280
3230	if (n >= STRING_MAX - 1)	3281	if (n >= sizeof (string) - 1)
3231	// stop at some sane length	3282	// stop at some sane length
3232	return NULL;	3283	return NULL;
3233		3284
3234	string[n++] = ch;	3285	string[n++] = ch;
3235	}	3286	}
…		…
3352	&nitems, &bytes_after, &value) == Success	3403	&nitems, &bytes_after, &value) == Success
3353	&& actual_type != None	3404	&& actual_type != None
3354	&& actual_format == 8)	3405	&& actual_format == 8)
3355	str = (const char *)(value);	3406	str = (const char *)(value);
3356		3407
3357	tt_printf ("\033]%d;%s%c", op, str, resp);	3408	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358		3409
3359	XFree (value);	3410	XFree (value);
3360	}	3411	}
3361	else	3412	else
3362	{	3413	{
…		…
3430	break;	3481	break;
3431	#endif	3482	#endif
3432	case URxvt_Color_border:	3483	case URxvt_Color_border:
3433	process_color_seq (op, Color_border, str, resp);	3484	process_color_seq (op, Color_border, str, resp);
3434	break;	3485	break;
3435	#if ENABLE_TRANSPARENCY	3486
		3487	#if BG_IMAGE_FROM_ROOT
3436	case URxvt_Color_tint:	3488	case URxvt_Color_tint:
3437	process_color_seq (op, Color_tint, str, resp);	3489	process_color_seq (op, Color_tint, str, resp);
3438	{	3490	{
3439	bool changed = false;	3491	bool changed = false;
3440		3492
3441	if (ISSET_PIXCOLOR (Color_tint))	3493	if (ISSET_PIXCOLOR (Color_tint))
3442	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3494	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443		3495
3444	if (changed)	3496	if (changed)
3445	update_background ();	3497	update_background ();
3446	}	3498	}
3447		3499
…		…
3451	#if BG_IMAGE_FROM_FILE	3503	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3504	case Rxvt_Pixmap:
3453	if (!strcmp (str, "?"))	3505	if (!strcmp (str, "?"))
3454	{	3506	{
3455	char str[256];	3507	char str[256];
		3508	int h_scale = fimage.h_scale;
		3509	int v_scale = fimage.v_scale;
		3510	int h_align = fimage.h_align;
		3511	int v_align = fimage.v_align;
3456		3512
3457	sprintf (str, "[%dx%d+%d+%d]",	3513	sprintf (str, "[%dx%d+%d+%d]",
3458	min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),	3514	h_scale, v_scale,
3459	min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));	3515	h_align, v_align);
3460	process_xterm_seq (XTerm_title, str, CHAR_ST);	3516	process_xterm_seq (XTerm_title, str, CHAR_ST);
3461	}	3517	}
3462	else	3518	else
3463	{	3519	{
3464	bool changed = false;	3520	bool changed = false;
3465		3521
3466	if (*str != ';')	3522	if (*str != ';')
3467	{	3523	{
3468	if (bg_image.set_file (str)) /* change pixmap */	3524	try
		3525	{
		3526	fimage.set_file_geometry (this, str);
3469	changed = true;	3527	changed = true;
		3528	}
		3529	catch (const class rxvt_failure_exception &e)
		3530	{
		3531	}
3470	}	3532	}
3471	else	3533	else
3472	{	3534	{
3473	str++;	3535	str++;
3474	if (bg_image.set_geometry (str, true))	3536	if (fimage.set_geometry (str, true))
3475	changed = true;	3537	changed = true;
3476	}	3538	}
3477		3539
3478	if (changed)	3540	if (changed)
3479	{	3541	{
3480	if (bg_window_position_sensitive ())	3542	if (bg_window_position_sensitive ())
3481	{	3543	{
3482	int x, y;	3544	int x, y;
3483	get_window_origin (x, y);	3545	get_window_origin (x, y);
3484	bg_set_position (x, y);	3546	parent_x = x;
		3547	parent_y = y;
3485	}	3548	}
3486	update_background ();	3549	update_background ();
3487	}	3550	}
3488	}	3551	}
3489	break;	3552	break;
…		…
3579	* 's' = save	3642	* 's' = save
3580	* 'r' = restore	3643	* 'r' = restore
3581	* 't' = toggle	3644	* 't' = toggle
3582	* so no need for fancy checking	3645	* so no need for fancy checking
3583	*/	3646	*/
3584	int	3647	int ecb_cold
3585	rxvt_term::privcases (int mode, unsigned long bit)	3648	rxvt_term::privcases (int mode, unsigned long bit)
3586	{	3649	{
3587	int state;	3650	int state;
3588		3651
3589	if (mode == 's')	3652	if (mode == 's')
…		…
3809	}	3872	}
3810	}	3873	}
3811	/}}} /	3874	/}}} /
3812		3875
3813	/{{{ process sgr sequences /	3876	/{{{ process sgr sequences /
3814	void	3877	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3878	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3879	{
3817	unsigned int i;	3880	unsigned int i;
3818	short rendset;	3881	short rendset;
3819	int rendstyle;	3882	int rendstyle;
…		…
3960	break;	4023	break;
3961	#endif	4024	#endif
3962	}	4025	}
3963	}	4026	}
3964	}	4027	}
		4028
		4029	void
		4030	rxvt_term::set_cursor_style (int style)
		4031	{
		4032	if (!IN_RANGE_INC (style, 0, 4))
		4033	return;
		4034
		4035	set_option (Opt_cursorUnderline, style >= 3);
		4036
		4037	#ifdef CURSOR_BLINK
		4038	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4039	cursor_blink_reset ();
		4040	#endif
		4041
		4042	want_refresh = 1;
		4043	}
3965	/}}} /	4044	/}}} /
3966		4045
3967	/* ------------------------------------------------------------------------- */	4046	/* ------------------------------------------------------------------------- */
3968		4047
3969	/*	4048	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC vs. Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC