[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.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
…		…
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))
…		…
828	#endif	857	#endif
829	/* nil */ ;	858	/* nil */ ;
830	}	859	}
831	}	860	}
832		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++;
		871	}
		872
833	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)))
834	return;	874	return;
835		875
836	if (len <= 0)	876	if (len <= 0)
837	return; /* not mapped */	877	return; /* not mapped */
…		…
841	{	881	{
842	view_start = 0;	882	view_start = 0;
843	want_refresh = 1;	883	want_refresh = 1;
844	}	884	}
845		885
846	/* escape prefix */
847	if (meta
848	#ifdef META8_OPTION
849	&& meta_char == C0_ESC
850	#endif
851	)
852	{
853	const char ch = C0_ESC;
854	tt_write (&ch, 1);
855	}
856
857	tt_write (kbuf, (unsigned int)len);	886	tt_write (kbuf, (unsigned int)len);
858	}	887	}
859		888
860	void	889	void ecb_cold
861	rxvt_term::key_release (XKeyEvent &ev)	890	rxvt_term::key_release (XKeyEvent &ev)
862	{	891	{
863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	892	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
864	KeySym keysym;	893	KeySym keysym;
865		894
…		…
937	void	966	void
938	rxvt_term::flush ()	967	rxvt_term::flush ()
939	{	968	{
940	flush_ev.stop ();	969	flush_ev.stop ();
941		970
942	#ifdef HAVE_BG_PIXMAP	971	#ifdef HAVE_IMG
943	if (bg_flags & BG_NEEDS_REFRESH)	972	if (bg_flags & BG_NEEDS_REFRESH)
944	{	973	{
945	bg_flags &= ~BG_NEEDS_REFRESH;	974	bg_flags &= ~BG_NEEDS_REFRESH;
946	scr_touch (false);	975	scr_touch (false);
947	}	976	}
…		…
987	while (row < end_row);	1016	while (row < end_row);
988	}	1017	}
989		1018
990	scr_refresh ();	1019	scr_refresh ();
991	scrollBar.show (1);	1020	scrollBar.show (1);
992	#ifdef USE_XIM	1021	#if USE_XIM
993	im_send_spot ();	1022	im_send_spot ();
994	#endif	1023	#endif
995	}	1024	}
996		1025
997	display->flush ();	1026	display->flush ();
…		…
1073		1102
1074	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1075	void	1104	void
1076	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077	{	1106	{
1078	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_lines))
1079	{	1108	{
1080	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081	want_refresh = 1;	1110	want_refresh = 1;
1082	refresh_check ();	1111	refresh_check ();
1083	}	1112	}
…		…
1088		1117
1089	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090	void	1119	void
1091	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092	{	1121	{
1093	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1122	if (scr_page (mouse_slip_wheel_speed))
1094	{	1123	{
1095	want_refresh = 1;	1124	want_refresh = 1;
1096	refresh_check ();	1125	refresh_check ();
1097	}	1126	}
1098		1127
…		…
1219	pty_write ();	1248	pty_write ();
1220		1249
1221	refresh_check ();	1250	refresh_check ();
1222	}	1251	}
1223		1252
1224	void	1253	void ecb_cold
1225	rxvt_term::pointer_unblank ()	1254	rxvt_term::pointer_unblank ()
1226	{	1255	{
1227	XDefineCursor (dpy, vt, TermWin_cursor);	1256	XDefineCursor (dpy, vt, TermWin_cursor);
1228	recolour_cursor ();	1257	recolour_cursor ();
1229		1258
…		…
1234	pointer_ev.start (pointerBlankDelay);	1263	pointer_ev.start (pointerBlankDelay);
1235	#endif	1264	#endif
1236	}	1265	}
1237		1266
1238	#ifdef POINTER_BLANK	1267	#ifdef POINTER_BLANK
1239	void	1268	void ecb_cold
1240	rxvt_term::pointer_blank ()	1269	rxvt_term::pointer_blank ()
1241	{	1270	{
1242	if (!option (Opt_pointerBlank))	1271	if (!option (Opt_pointerBlank))
1243	return;	1272	return;
1244		1273
…		…
1246	XFlush (dpy);	1275	XFlush (dpy);
1247		1276
1248	hidden_pointer = 1;	1277	hidden_pointer = 1;
1249	}	1278	}
1250		1279
1251	void	1280	void ecb_cold
1252	rxvt_term::pointer_cb (ev::timer &w, int revents)	1281	rxvt_term::pointer_cb (ev::timer &w, int revents)
1253	{	1282	{
1254	make_current ();	1283	make_current ();
1255		1284
1256	pointer_blank ();	1285	pointer_blank ();
…		…
1348	32 + x,	1377	32 + x,
1349	32 + y);	1378	32 + y);
1350	}	1379	}
1351		1380
1352	/{{{ process an X event /	1381	/{{{ process an X event /
1353	void	1382	void ecb_hot
1354	rxvt_term::x_cb (XEvent &ev)	1383	rxvt_term::x_cb (XEvent &ev)
1355	{	1384	{
1356	make_current ();	1385	make_current ();
1357		1386
1358	dLocal (Display *, dpy);	1387	dLocal (Display *, dpy);
…		…
1461	if (ev.xconfigure.window == parent)	1490	if (ev.xconfigure.window == parent)
1462	{	1491	{
1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1492	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464	;	1493	;
1465		1494
		1495	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1496
		1497	bool moved = false;
1466	#ifdef HAVE_BG_PIXMAP	1498	#ifdef HAVE_BG_PIXMAP
1467	bool moved = false;
1468	if (bg_window_position_sensitive ())	1499	if (bg_window_position_sensitive ())
1469	{	1500	{
		1501	want_position_change = true;
		1502	if (bg_img == 0)
		1503	moved = true;
		1504	}
		1505	#endif
		1506
		1507	if (want_position_change)
		1508	{
1470	int x, y;	1509	int x, y;
		1510
1471	if (ev.xconfigure.send_event)	1511	if (ev.xconfigure.send_event)
1472	{	1512	{
1473	x = ev.xconfigure.x;	1513	x = ev.xconfigure.x;
1474	y = ev.xconfigure.y;	1514	y = ev.xconfigure.y;
1475	}	1515	}
1476	else	1516	else
1477	get_window_origin (x, y);	1517	get_window_origin (x, y);
1478		1518
1479	if (bg_set_position (x, y)	1519	if (x != parent_x \|\| y != parent_y)
1480	\|\| !(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));
1481	moved = true;	1524	moved = true;
		1525	}
1482	}	1526	}
1483	#endif
1484		1527
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1528	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1529	{
1487	seen_resize = 1;	1530	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1531	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1511	selection_send (ev.xselectionrequest);	1554	selection_send (ev.xselectionrequest);
1512	break;	1555	break;
1513		1556
1514	case MapNotify:	1557	case MapNotify:
1515	#ifdef HAVE_BG_PIXMAP	1558	#ifdef HAVE_BG_PIXMAP
1516	/* 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
1517	* non-reparenting window manager. In those cases we never get first	1560	// or a non-reparenting window manager and also because we
1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1561	// defer bg image updates if the window is not mapped. The
1519	* care of multiplicity of ConfigureNotify events arriving while WM does	1562	// short delay is to optimize for multiple ConfigureNotify
1520	* reparenting.	1563	// events at startup when the window manager reparents the
1521	* We should not render background immediately, as there could be several	1564	// 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	1565	// received all of them.
1523	* by scheduling background redraw as soon as we can, but giving a short	1566	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);	1567	update_background_ev.start (0.025);
1530	#endif	1568	#endif
1531	mapped = 1;	1569	mapped = 1;
1532	#ifdef TEXT_BLINK	1570	#ifdef TEXT_BLINK
1533	text_blink_ev.start ();	1571	text_blink_ev.start ();
…		…
1625		1663
1626	#ifdef SELECTION_SCROLLING	1664	#ifdef SELECTION_SCROLLING
1627	if (ev.xbutton.y < int_bwidth	1665	if (ev.xbutton.y < int_bwidth
1628	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1666	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1629	{	1667	{
		1668	page_dirn scroll_selection_dir;
1630	int dist;	1669	int dist;
1631		1670
1632	/* don't clobber the current delay if we are	1671	/* don't clobber the current delay if we are
1633	* already in the middle of scrolling.	1672	* already in the middle of scrolling.
1634	*/	1673	*/
…		…
1657	scroll_selection_lines = Pixel2Height (dist)	1696	scroll_selection_lines = Pixel2Height (dist)
1658	/ SELECTION_SCROLL_LINE_SPEEDUP	1697	/ SELECTION_SCROLL_LINE_SPEEDUP
1659	+ 1;	1698	+ 1;
1660	min_it (scroll_selection_lines,	1699	min_it (scroll_selection_lines,
1661	SELECTION_SCROLL_MAX_LINES);	1700	SELECTION_SCROLL_MAX_LINES);
		1701	scroll_selection_lines *= scroll_selection_dir;
1662	}	1702	}
1663	else	1703	else
1664	{	1704	{
1665	/* we are within the text window, so we	1705	/* we are within the text window, so we
1666	* shouldn't be scrolling	1706	* shouldn't be scrolling
…		…
1713		1753
1714	refresh_check ();	1754	refresh_check ();
1715	}	1755	}
1716		1756
1717	#if ENABLE_FRILLS	1757	#if ENABLE_FRILLS
1718	void	1758	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1759	rxvt_term::set_urgency (bool enable)
1720	{	1760	{
1721	if (enable == urgency_hint)	1761	if (enable == urgency_hint)
1722	return;	1762	return;
1723		1763
…		…
1729	XFree (h);	1769	XFree (h);
1730	}	1770	}
1731	}	1771	}
1732	#endif	1772	#endif
1733		1773
1734	void	1774	void ecb_cold
1735	rxvt_term::focus_in ()	1775	rxvt_term::focus_in ()
1736	{	1776	{
1737	if (!focus)	1777	if (!focus)
1738	{	1778	{
1739	focus = 1;	1779	focus = 1;
…		…
1764		1804
1765	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1805	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766	}	1806	}
1767	}	1807	}
1768		1808
1769	void	1809	void ecb_cold
1770	rxvt_term::focus_out ()	1810	rxvt_term::focus_out ()
1771	{	1811	{
1772	if (focus)	1812	if (focus)
1773	{	1813	{
1774	focus = 0;	1814	focus = 0;
…		…
1807		1847
1808	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1848	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809	}	1849	}
1810	}	1850	}
1811		1851
1812	void	1852	void ecb_cold
1813	rxvt_term::update_fade_color (unsigned int idx)	1853	rxvt_term::update_fade_color (unsigned int idx)
1814	{	1854	{
1815	#if OFF_FOCUS_FADING	1855	#if OFF_FOCUS_FADING
1816	if (rs[Rs_fade])	1856	if (rs[Rs_fade])
1817	{	1857	{
…		…
1820	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);
1821	}	1861	}
1822	#endif	1862	#endif
1823	}	1863	}
1824		1864
1825	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1865	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1826	void	1866	void ecb_hot
1827	rxvt_term::rootwin_cb (XEvent &ev)	1867	rxvt_term::rootwin_cb (XEvent &ev)
1828	{	1868	{
1829	make_current ();	1869	make_current ();
1830		1870
1831	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1871	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1872	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833	return;	1873	return;
1834		1874
1835	# if ENABLE_TRANSPARENCY
1836	switch (ev.type)	1875	switch (ev.type)
1837	{	1876	{
1838	case PropertyNotify:	1877	case PropertyNotify:
1839	/*	1878	/*
1840	* 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,
1841	* 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.
1842	*/	1881	*/
1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1882	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1883	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	{	1884	{
1846	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);
1847	update_background ();	1889	update_background ();
		1890	}
		1891	#endif
		1892	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848	}	1893	}
1849		1894
1850	break;	1895	break;
1851	}	1896	}
1852	# endif
1853		1897
1854	refresh_check ();	1898	refresh_check ();
1855	}	1899	}
1856	#endif	1900	#endif
1857		1901
…		…
2178		2222
2179	#ifdef MOUSE_WHEEL	2223	#ifdef MOUSE_WHEEL
2180	case Button4:	2224	case Button4:
2181	case Button5:	2225	case Button5:
2182	{	2226	{
2183	int i;	2227	int lines;
2184	page_dirn v;	2228	page_dirn dirn;
2185		2229
2186	v = ev.button == Button4 ? UP : DN;	2230	dirn = ev.button == Button4 ? UP : DN;
2187		2231
2188	if (ev.state & ShiftMask)	2232	if (ev.state & ShiftMask)
2189	i = 1;	2233	lines = 1;
2190	else if (option (Opt_mouseWheelScrollPage))	2234	else if (option (Opt_mouseWheelScrollPage))
2191	i = nrow - 1;	2235	lines = nrow - 1;
2192	else	2236	else
2193	i = 5;	2237	lines = 5;
2194		2238
2195	# ifdef MOUSE_SLIP_WHEELING	2239	# ifdef MOUSE_SLIP_WHEELING
2196	if (ev.state & ControlMask)	2240	if (ev.state & ControlMask)
2197	{	2241	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2242	mouse_slip_wheel_speed += dirn;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2243	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2244
2202	if (!slip_wheel_ev.is_active ())	2245	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2246	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204	}	2247	}
2205	else	2248	else
2206	# endif	2249	# endif
2207	{	2250	{
2208	scr_page (v, i);	2251	scr_page (dirn, lines);
2209	scrollBar.show (1);	2252	scrollBar.show (1);
2210	}	2253	}
2211	}	2254	}
2212	break;	2255	break;
2213	#endif	2256	#endif
…		…
2215	}	2258	}
2216	}	2259	}
2217		2260
2218	/}}} /	2261	/}}} /
2219		2262
2220	void	2263	void ecb_hot
2221	rxvt_term::cmd_parse ()	2264	rxvt_term::cmd_parse ()
2222	{	2265	{
2223	wchar_t ch = NOCHAR;	2266	wchar_t ch = NOCHAR;
2224	char *seq_begin; // remember start of esc-sequence here	2267	char *seq_begin; // remember start of esc-sequence here
2225		2268
…		…
2344	}	2387	}
2345	}	2388	}
2346	}	2389	}
2347		2390
2348	// read the next character	2391	// read the next character
2349	wchar_t	2392	wchar_t ecb_hot
2350	rxvt_term::next_char () NOTHROW	2393	rxvt_term::next_char () NOTHROW
2351	{	2394	{
2352	while (cmdbuf_ptr < cmdbuf_endp)	2395	while (cmdbuf_ptr < cmdbuf_endp)
2353	{	2396	{
2354	// assume 7-bit to be ascii ALWAYS	2397	// assume 7-bit to be ascii ALWAYS
…		…
2366	}	2409	}
2367		2410
2368	if (len == (size_t)-1)	2411	if (len == (size_t)-1)
2369	{	2412	{
2370	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.
2371	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
2372	}	2417	}
2373		2418
2374	// assume wchar == unicode	2419	// assume wchar == unicode
2375	cmdbuf_ptr += len;	2420	cmdbuf_ptr += len;
…		…
2378		2423
2379	return NOCHAR;	2424	return NOCHAR;
2380	}	2425	}
2381		2426
2382	// read the next octet	2427	// read the next octet
2383	uint32_t	2428	uint32_t ecb_hot
2384	rxvt_term::next_octet () NOTHROW	2429	rxvt_term::next_octet () NOTHROW
2385	{	2430	{
2386	return cmdbuf_ptr < cmdbuf_endp	2431	return cmdbuf_ptr < cmdbuf_endp
2387	? (unsigned char)*cmdbuf_ptr++	2432	? (unsigned char)*cmdbuf_ptr++
2388	: NOCHAR;	2433	: NOCHAR;
2389	}	2434	}
2390		2435
2391	static class out_of_input out_of_input;	2436	static class out_of_input out_of_input;
2392		2437
2393	wchar_t	2438	wchar_t ecb_hot
2394	rxvt_term::cmd_getc () THROW ((class out_of_input))	2439	rxvt_term::cmd_getc () THROW ((class out_of_input))
2395	{	2440	{
2396	wchar_t c = next_char ();	2441	wchar_t c = next_char ();
2397		2442
2398	if (c == NOCHAR)	2443	if (c == NOCHAR)
2399	throw out_of_input;	2444	throw out_of_input;
2400		2445
2401	return c;	2446	return c;
2402	}	2447	}
2403		2448
2404	uint32_t	2449	uint32_t ecb_hot
2405	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2450	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2406	{	2451	{
2407	uint32_t c = next_octet ();	2452	uint32_t c = next_octet ();
2408		2453
2409	if (c == NOCHAR)	2454	if (c == NOCHAR)
…		…
2413	}	2458	}
2414		2459
2415	/{{{ print pipe /	2460	/{{{ print pipe /
2416	/----------------------------------------------------------------------/	2461	/----------------------------------------------------------------------/
2417	#ifdef PRINTPIPE	2462	#ifdef PRINTPIPE
2418	FILE *	2463	FILE * ecb_cold
2419	rxvt_term::popen_printer ()	2464	rxvt_term::popen_printer ()
2420	{	2465	{
2421	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");
2422		2467
2423	if (stream == NULL)	2468	if (stream == NULL)
2424	rxvt_warn ("can't open printer pipe, not printing.\n");	2469	rxvt_warn ("can't open printer pipe, not printing.\n");
2425		2470
2426	return stream;	2471	return stream;
2427	}	2472	}
2428		2473
2429	int	2474	int ecb_cold
2430	rxvt_term::pclose_printer (FILE *stream)	2475	rxvt_term::pclose_printer (FILE *stream)
2431	{	2476	{
2432	fflush (stream);	2477	fflush (stream);
2433	return pclose (stream);	2478	return pclose (stream);
2434	}	2479	}
2435		2480
2436	/*	2481	/*
2437	* simulate attached vt100 printer	2482	* simulate attached vt100 printer
2438	*/	2483	*/
2439	void	2484	void ecb_cold
2440	rxvt_term::process_print_pipe ()	2485	rxvt_term::process_print_pipe ()
2441	{	2486	{
2442	FILE *fd = popen_printer ();	2487	FILE *fd = popen_printer ();
2443		2488
2444	if (!fd)	2489	if (!fd)
…		…
2499	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,
2500	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,
2501	};	2546	};
2502		2547
2503	/{{{ process non-printing single characters /	2548	/{{{ process non-printing single characters /
2504	void	2549	void ecb_hot
2505	rxvt_term::process_nonprinting (unicode_t ch)	2550	rxvt_term::process_nonprinting (unicode_t ch)
2506	{	2551	{
2507	switch (ch)	2552	switch (ch)
2508	{	2553	{
2509	case C0_ESC:	2554	case C0_ESC:
…		…
2555	}	2600	}
2556	/}}} /	2601	/}}} /
2557		2602
2558		2603
2559	/{{{ process VT52 escape sequences /	2604	/{{{ process VT52 escape sequences /
2560	void	2605	void ecb_cold
2561	rxvt_term::process_escape_vt52 (unicode_t ch)	2606	rxvt_term::process_escape_vt52 (unicode_t ch)
2562	{	2607	{
2563	int row, col;	2608	int row, col;
2564		2609
2565	switch (ch)	2610	switch (ch)
…		…
2615	}	2660	}
2616	/}}} /	2661	/}}} /
2617		2662
2618		2663
2619	/{{{ process escape sequences /	2664	/{{{ process escape sequences /
2620	void	2665	void ecb_hot
2621	rxvt_term::process_escape_seq ()	2666	rxvt_term::process_escape_seq ()
2622	{	2667	{
2623	unicode_t ch = cmd_getc ();	2668	unicode_t ch = cmd_getc ();
2624		2669
2625	if (priv_modes & PrivMode_vt52)	2670	if (priv_modes & PrivMode_vt52)
…		…
2777	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, */
2778	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, */
2779	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, {, \|, }, ~, */
2780	};	2825	};
2781		2826
2782	void	2827	void ecb_hot
2783	rxvt_term::process_csi_seq ()	2828	rxvt_term::process_csi_seq ()
2784	{	2829	{
2785	unicode_t ch, priv, i;	2830	unicode_t ch, priv, prev_ch, i;
2786	unsigned int nargs, p;	2831	unsigned int nargs, p;
2787	int n, ndef;	2832	int n, ndef;
2788	int arg[ESC_ARGS] = { };	2833	int arg[ESC_ARGS] = { };
2789		2834
2790	nargs = 0;	2835	nargs = 0;
…		…
2796	/* '<' '=' '>' '?' '!' */	2841	/* '<' '=' '>' '?' '!' */
2797	priv = ch;	2842	priv = ch;
2798	ch = cmd_getc ();	2843	ch = cmd_getc ();
2799	}	2844	}
2800		2845
		2846	prev_ch = 0;
2801	/* read any numerical arguments */	2847	/* read any numerical arguments */
2802	for (n = -1; ch < CSI_ICH; )	2848	for (n = -1; ch < CSI_ICH; )
2803	{	2849	{
2804	if (isdigit (ch))	2850	if (isdigit (ch))
2805	{	2851	{
…		…
2815	n = -1;	2861	n = -1;
2816	}	2862	}
2817	else if (IS_CONTROL (ch))	2863	else if (IS_CONTROL (ch))
2818	process_nonprinting (ch);	2864	process_nonprinting (ch);
2819		2865
		2866	prev_ch = ch;
2820	ch = cmd_getc ();	2867	ch = cmd_getc ();
2821	}	2868	}
2822		2869
2823	if (ch > CSI_7F)	2870	if (ch > CSI_7F)
2824	return;	2871	return;
…		…
3058	scr_insert_mode (1);	3105	scr_insert_mode (1);
3059	else if (arg[0] == 20)	3106	else if (arg[0] == 20)
3060	priv_modes \|= PrivMode_LFNL;	3107	priv_modes \|= PrivMode_LFNL;
3061	break;	3108	break;
3062		3109
		3110	case CSI_71: // DESCUSR: set cursor style
		3111	if (prev_ch == ' ')
		3112	set_cursor_style (arg[0]);
		3113	break;
		3114
3063	/*	3115	/*
3064	* PRIVATE USE beyond this point. All CSI_7? sequences here	3116	* PRIVATE USE beyond this point. All CSI_7? sequences here
3065	*/	3117	*/
3066	case CSI_72: /* DECSTBM: set top and bottom margins */	3118	case CSI_72: /* DECSTBM: set top and bottom margins */
3067	if (nargs == 1)	3119	if (nargs == 1)
…		…
3200	rxvt_term::get_to_st (unicode_t &ends_how)	3252	rxvt_term::get_to_st (unicode_t &ends_how)
3201	{	3253	{
3202	unicode_t ch;	3254	unicode_t ch;
3203	bool seen_esc = false;	3255	bool seen_esc = false;
3204	unsigned int n = 0;	3256	unsigned int n = 0;
3205	wchar_t string[STRING_MAX];	3257	wchar_t string[CBUFSIZ];
3206		3258
3207	while ((ch = cmd_getc ()) != NOCHAR)	3259	while ((ch = cmd_getc ()) != NOCHAR)
3208	{	3260	{
3209	if (seen_esc)	3261	if (seen_esc)
3210	{	3262	{
…		…
3225	else if (ch < 0x20)	3277	else if (ch < 0x20)
3226	return NULL; /* other control character - exit */	3278	return NULL; /* other control character - exit */
3227		3279
3228	seen_esc = false;	3280	seen_esc = false;
3229		3281
3230	if (n >= STRING_MAX - 1)	3282	if (n >= sizeof (string) - 1)
3231	// stop at some sane length	3283	// stop at some sane length
3232	return NULL;	3284	return NULL;
3233		3285
3234	string[n++] = ch;	3286	string[n++] = ch;
3235	}	3287	}
…		…
3352	&nitems, &bytes_after, &value) == Success	3404	&nitems, &bytes_after, &value) == Success
3353	&& actual_type != None	3405	&& actual_type != None
3354	&& actual_format == 8)	3406	&& actual_format == 8)
3355	str = (const char *)(value);	3407	str = (const char *)(value);
3356		3408
3357	tt_printf ("\033]%d;%s%c", op, str, resp);	3409	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358		3410
3359	XFree (value);	3411	XFree (value);
3360	}	3412	}
3361	else	3413	else
3362	{	3414	{
…		…
3430	break;	3482	break;
3431	#endif	3483	#endif
3432	case URxvt_Color_border:	3484	case URxvt_Color_border:
3433	process_color_seq (op, Color_border, str, resp);	3485	process_color_seq (op, Color_border, str, resp);
3434	break;	3486	break;
3435	#if ENABLE_TRANSPARENCY	3487
		3488	#if BG_IMAGE_FROM_ROOT
3436	case URxvt_Color_tint:	3489	case URxvt_Color_tint:
3437	process_color_seq (op, Color_tint, str, resp);	3490	process_color_seq (op, Color_tint, str, resp);
3438	{	3491	{
3439	bool changed = false;	3492	bool changed = false;
3440		3493
3441	if (ISSET_PIXCOLOR (Color_tint))	3494	if (ISSET_PIXCOLOR (Color_tint))
3442	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3495	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443		3496
3444	if (changed)	3497	if (changed)
3445	update_background ();	3498	update_background ();
3446	}	3499	}
3447		3500
…		…
3451	#if BG_IMAGE_FROM_FILE	3504	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3505	case Rxvt_Pixmap:
3453	if (!strcmp (str, "?"))	3506	if (!strcmp (str, "?"))
3454	{	3507	{
3455	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;
3456		3513
3457	sprintf (str, "[%dx%d+%d+%d]",	3514	sprintf (str, "[%dx%d+%d+%d]",
3458	min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),	3515	h_scale, v_scale,
3459	min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));	3516	h_align, v_align);
3460	process_xterm_seq (XTerm_title, str, CHAR_ST);	3517	process_xterm_seq (XTerm_title, str, CHAR_ST);
3461	}	3518	}
3462	else	3519	else
3463	{	3520	{
3464	bool changed = false;	3521	bool changed = false;
3465		3522
3466	if (*str != ';')	3523	if (*str != ';')
3467	{	3524	{
3468	if (bg_image.set_file (str)) /* change pixmap */	3525	try
		3526	{
		3527	fimage.set_file_geometry (this, str);
3469	changed = true;	3528	changed = true;
		3529	}
		3530	catch (const class rxvt_failure_exception &e)
		3531	{
		3532	}
3470	}	3533	}
3471	else	3534	else
3472	{	3535	{
3473	str++;	3536	str++;
3474	if (bg_image.set_geometry (str, true))	3537	if (fimage.set_geometry (str, true))
3475	changed = true;	3538	changed = true;
3476	}	3539	}
3477		3540
3478	if (changed)	3541	if (changed)
3479	{	3542	{
3480	if (bg_window_position_sensitive ())	3543	if (bg_window_position_sensitive ())
3481	{	3544	{
3482	int x, y;	3545	int x, y;
3483	get_window_origin (x, y);	3546	get_window_origin (x, y);
3484	bg_set_position (x, y);	3547	parent_x = x;
		3548	parent_y = y;
3485	}	3549	}
3486	update_background ();	3550	update_background ();
3487	}	3551	}
3488	}	3552	}
3489	break;	3553	break;
…		…
3579	* 's' = save	3643	* 's' = save
3580	* 'r' = restore	3644	* 'r' = restore
3581	* 't' = toggle	3645	* 't' = toggle
3582	* so no need for fancy checking	3646	* so no need for fancy checking
3583	*/	3647	*/
3584	int	3648	int ecb_cold
3585	rxvt_term::privcases (int mode, unsigned long bit)	3649	rxvt_term::privcases (int mode, unsigned long bit)
3586	{	3650	{
3587	int state;	3651	int state;
3588		3652
3589	if (mode == 's')	3653	if (mode == 's')
…		…
3809	}	3873	}
3810	}	3874	}
3811	/}}} /	3875	/}}} /
3812		3876
3813	/{{{ process sgr sequences /	3877	/{{{ process sgr sequences /
3814	void	3878	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3879	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3880	{
3817	unsigned int i;	3881	unsigned int i;
3818	short rendset;	3882	short rendset;
3819	int rendstyle;	3883	int rendstyle;
…		…
3960	break;	4024	break;
3961	#endif	4025	#endif
3962	}	4026	}
3963	}	4027	}
3964	}	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	}
3965	/}}} /	4045	/}}} /
3966		4046
3967	/* ------------------------------------------------------------------------- */	4047	/* ------------------------------------------------------------------------- */
3968		4048
3969	/*	4049	/*

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.544 by sf-exg, Sat Apr 26 14:55:58 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.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC