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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>	16	* Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
		17	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17	*	18	*
18	* This program is free software; you can redistribute it and/or modify	19	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	20	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	21	* the Free Software Foundation; either version 3 of the License, or
21	* (at your option) any later version.	22	* (at your option) any later version.
22	*	23	*
23	* This program is distributed in the hope that it will be useful,	24	* This program is distributed in the hope that it will be useful,
24	* but WITHOUT ANY WARRANTY; without even the implied warranty of	25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
25	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
36	#include "keyboard.h"	37	#include "keyboard.h"
37	#include "rxvtperl.h"	38	#include "rxvtperl.h"
38		39
39	#include <limits>	40	#include <limits>
40		41
41	#include <cassert>	42	#include <assert.h>
42	#include <csignal>	43	#include <signal.h>
43	#include <cstring>	44	#include <string.h>
44		45
45	#include <termios.h>	46	#include <termios.h>
46		47
47	#ifdef HAVE_XSETLOCALE	48	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	49	# define X_LOCALE
49	# include <X11/Xlocale.h>	50	# include <X11/Xlocale.h>
50	#else	51	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	52	# include <locale.h>
53	# endif
54	#endif	53	#endif
55		54
56	struct termios rxvt_term::def_tio;	55	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
58		57
…		…
152	}	151	}
153	#endif	152	#endif
154		153
155	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
156	{	155	{
157	#if HAVE_BG_PIXMAP
158	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159	#endif
160	#ifdef CURSOR_BLINK	156	#ifdef CURSOR_BLINK
161	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);	157	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162	#endif	158	#endif
163	#ifdef TEXT_BLINK	159	#ifdef TEXT_BLINK
164	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);	160	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
…		…
170	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	166	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171	#endif	167	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	169	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174	#endif	170	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	171	#if ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	172	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	173	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	174	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	175	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	176	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	177	#endif
182	#ifdef POINTER_BLANK	178	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	179	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	180	#endif
…		…
224	if (fontset[i] != fontset[0])	220	if (fontset[i] != fontset[0])
225	delete fontset[i];	221	delete fontset[i];
226	#endif	222	#endif
227	delete fontset[0];	223	delete fontset[0];
228		224
229	#ifdef HAVE_BG_PIXMAP	225	#if HAVE_IMG
230	bg_destroy ();	226	delete bg_img;
231	#endif	227	#endif
232		228
233	if (display)	229	if (display)
234	{	230	{
235	selection_clear ();	231	selection_clear ();
236	selection_clear (true);	232	selection_clear (true);
237		233
238	#ifdef USE_XIM	234	#if USE_XIM
239	im_destroy ();	235	im_destroy ();
240	#endif	236	#endif
241	scrollBar.destroy ();	237	scrollBar.destroy ();
		238
		239	if (gc)
242	if (gc) XFreeGC (dpy, gc);	240	XFreeGC (dpy, gc);
243		241
244	delete drawable;	242	delete drawable;
		243
245	// destroy all windows	244	// destroy all windows
246	if (parent)	245	if (parent)
247	XDestroyWindow (dpy, parent);	246	XDestroyWindow (dpy, parent);
248		247
249	for (int i = 0; i < TOTAL_COLORS; i++)	248	for (int i = 0; i < TOTAL_COLORS; i++)
250	if (ISSET_PIXCOLOR (i))	249	if (ISSET_PIXCOLOR (i))
251	{	250	{
252	pix_colors_focused [i].free (this);	251	pix_colors_focused [i].free (this);
253	#if OFF_FOCUS_FADING	252	#if OFF_FOCUS_FADING
		253	if (rs[Rs_fade])
254	pix_colors_unfocused [i].free (this);	254	pix_colors_unfocused [i].free (this);
255	#endif	255	#endif
256	}	256	}
257		257
258	clear ();	258	clear ();
259		259
…		…
272	free (locale);	272	free (locale);
273	free (v_buffer);	273	free (v_buffer);
274		274
275	delete selection_req;	275	delete selection_req;
276		276
		277	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		278	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		279
		280	delete [] env;
		281
277	delete envv;	282	delete envv;
278	delete argv;	283	delete argv;
279		284
280	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
281	delete keyboard;	286	delete keyboard;
282	#endif	287	#endif
283	#ifndef NO_RESOURCES	288	#ifndef NO_RESOURCES
284	XrmDestroyDatabase (option_db);	289	XrmDestroyDatabase (option_db);
285	#endif	290	#endif
		291
		292	SET_R ((rxvt_term *)0);
286	}	293	}
287		294
288	// child has exited, usually destroys	295	// child has exited, usually destroys
289	void	296	void
290	rxvt_term::child_cb (ev::child &w, int status)	297	rxvt_term::child_cb (ev::child &w, int status)
…		…
313	{	320	{
314	#if USE_XIM	321	#if USE_XIM
315	im_ev.stop (display);	322	im_ev.stop (display);
316	#endif	323	#endif
317	scrollbar_ev.stop (display);	324	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	325	#if ENABLE_PERL
319	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
320	#endif	327	#endif
321	termwin_ev.stop (display);	328	termwin_ev.stop (display);
322	vt_ev.stop (display);	329	vt_ev.stop (display);
323	}	330	}
…		…
350		357
351	delete this;	358	delete this;
352	}	359	}
353		360
354	void	361	void
355	rxvt_term::set_option (uint8_t opt, bool set)	362	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356	{	363	{
357	if (!opt)	364	if (!opt)
358	return;	365	return;
359		366
360	uint8_t mask = 1 << (opt & 7);	367	uint8_t mask = 1 << (opt & 7);
…		…
364	}	371	}
365		372
366	/----------------------------------------------------------------------/	373	/----------------------------------------------------------------------/
367	/*	374	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	375	* Exit gracefully, clearing the utmp entry and restoring tty attributes
369	* TODO: if debugging, this should free up any known resources if we can
370	*/	376	*/
371	static XErrorHandler old_xerror_handler;	377	static XErrorHandler old_xerror_handler;
372		378
373	static void	379	static void
374	rxvt_emergency_cleanup ()	380	rxvt_emergency_cleanup ()
…		…
376	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	382	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377	(*t)->emergency_cleanup ();	383	(*t)->emergency_cleanup ();
378	}	384	}
379		385
380	#if !ENABLE_MINIMAL	386	#if !ENABLE_MINIMAL
381	static void	387	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	388	print_x_error (Display dpy, XErrorEvent event)
383	{	389	{
384	char buffer[BUFSIZ];	390	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	391	char mesg[BUFSIZ];
386	char number[32];	392	char number[32];
387	const char mtype[] = "XlibMessage";	393
388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	394	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		395
		396	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		397	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		398
		399	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		400	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		402
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	403	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	404	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		405
		406	if (event->request_code >= 128)
		407	{
		408	#if 0
		409	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		410	int nexts;
		411	char **exts = XListExtensions (dpy, &nexts);
		412
		413	while (nexts)
		414	{
		415	char *extname = exts [nexts - 1];
		416	int major, first_event, first_error;
		417
		418	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		419	{
		420	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		421	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		422
		423	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		424	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		425	rxvt_warn ("+ (which is %s)\n", buffer);
		426
		427	break;
		428	}
		429
		430	printf ("nextss %d %s\n", nexts, extname);//D
		431	--nexts;
		432	++exts;
		433	}
		434	#else
		435	int nexts = 0;
		436	char **exts = 0;
		437	#endif
		438
		439	if (!nexts)
		440	{
		441	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		442
		443	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		444	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		445
		446	#if 0
		447	sprintf (number, "RENDER.%d", event->minor_code);
		448	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		449	rxvt_warn ("+ (which is %s)\n", buffer);
		450	#endif
		451	}
		452
		453	XFreeExtensionList (exts);
		454	}
		455	else
		456	{
394	sprintf(number, "%d", event->request_code);	457	sprintf (number, "%d", event->request_code);
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	458	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);	459	rxvt_warn ("+ (which is %s)\n", buffer);
397	if (event->request_code >= 128) {
398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399	mesg, BUFSIZ);
400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401	}	460	}
		461
402	if ((event->error_code == BadWindow) \|\|	462	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	463	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	464	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	465	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	466	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	467	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	468	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	469	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	470	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	471	\|\| event->error_code == BadAtom)
		472	{
412	if (event->error_code == BadValue)	473	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	474	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	475	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	476	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	477	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	478	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422	}
423	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424	mesg, BUFSIZ);
425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426	}
427	#endif
428		479
429	int	480	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		481	}
		482	}
		483	#endif
		484
		485	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	486	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	487	{
432	if (GET_R->allowedxerror == -1)	488	if (GET_R && GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	489	GET_R->allowedxerror = event->error_code;
434	else	490	else
435	{	491	{
436	// GET_R is most likely not the terminal which caused the error,	492	// GET_R is most likely not the terminal which caused the error,
437	// so just output the error and continue	493	// so just output the error and continue
…		…
443	}	499	}
444		500
445	return 0;	501	return 0;
446	}	502	}
447		503
448	int	504	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	505	rxvt_xioerror_handler (Display *display)
450	{	506	{
451	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	507	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452	DisplayString (display));	508	DisplayString (display));
453	rxvt_emergency_cleanup ();	509	rxvt_emergency_cleanup ();
…		…
573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	629	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574	// TODO: handle this with exceptions and tolerate the memory loss	630	// TODO: handle this with exceptions and tolerate the memory loss
575	XSetIOErrorHandler (rxvt_xioerror_handler);	631	XSetIOErrorHandler (rxvt_xioerror_handler);
576		632
577	XrmInitialize ();	633	XrmInitialize ();
		634
		635	#if HAVE_PIXBUF
		636	g_type_init ();
		637	#endif
578	}	638	}
579		639
580	/----------------------------------------------------------------------/	640	/----------------------------------------------------------------------/
581	/*	641	/*
582	* window size/position calculations for XSizeHint and other storage.	642	* window size/position calculations for XSizeHint and other storage.
…		…
766		826
767	delete fontset[0];	827	delete fontset[0];
768	fontset[0] = fs;	828	fontset[0] = fs;
769		829
770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	830	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771	prop.height += lineSpace;	831	prop.width = max (prop.width + letterSpace, 1);
772	prop.width += letterSpace;
773		832
774	fs->set_prop (prop, false);	833	fs->set_prop (prop, false);
775		834
776	fwidth = prop.width;	835	fwidth = prop.width;
777	fheight = prop.height;	836	fheight = prop.height + lineSpace;
778	fbase = prop.ascent;	837	fbase = prop.ascent;
779		838
780	for (int style = 1; style < 4; style++)	839	for (int style = 1; style < 4; style++)
781	{	840	{
782	#if ENABLE_STYLES	841	#if ENABLE_STYLES
…		…
877		936
878	void	937	void
879	rxvt_term::set_window_color (int idx, const char *color)	938	rxvt_term::set_window_color (int idx, const char *color)
880	{	939	{
881	#ifdef XTERM_COLOR_CHANGE	940	#ifdef XTERM_COLOR_CHANGE
882	rxvt_color xcol;
883
884	if (color == NULL \|\| *color == '\0')	941	if (color == NULL \|\| *color == '\0')
885	return;	942	return;
886		943
887	color = strdup (color);	944	color = strdup (color);
888	allocated.push_back ((void *)color);	945	allocated.push_back ((void *)color);
…		…
894	int i = atoi (color);	951	int i = atoi (color);
895		952
896	if (i >= 8 && i <= 15)	953	if (i >= 8 && i <= 15)
897	{	954	{
898	/* bright colors */	955	/* bright colors */
899	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	956	alias_color (idx, minBrightCOLOR + i - 8);
900	goto done;	957	goto done;
901	}	958	}
902		959
903	if (i >= 0 && i <= 7)	960	if (i >= 0 && i <= 7)
904	{	961	{
905	/* normal colors */	962	/* normal colors */
906	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	963	alias_color (idx, minCOLOR + i);
907	goto done;	964	goto done;
908	}	965	}
909	}	966	}
910		967
911	set_color (xcol, color);	968	pix_colors_focused[idx].free (this);
912		969	set_color (pix_colors_focused[idx], color);
913	/*
914	* FIXME: should free colors here, but no idea how to do it so instead,
915	* so just keep gobbling up the colormap
916	*/
917
918	pix_colors_focused[idx] = xcol;
919		970
920	done:	971	done:
921	/TODO: handle Color_BD, scrollbar background, etc. /	972	/TODO: handle Color_BD, scrollbar background, etc. /
922		973
923	update_fade_color (idx);	974	update_fade_color (idx);
924	recolour_cursor ();	975	recolor_cursor ();
925	scr_recolour ();	976	scr_recolor ();
926	#endif /* XTERM_COLOR_CHANGE */	977	#endif /* XTERM_COLOR_CHANGE */
927	}	978	}
928		979
929	void	980	void
930	rxvt_term::recolour_cursor ()	981	rxvt_term::recolor_cursor ()
931	{	982	{
932	XColor fg, bg;	983	XColor fg, bg;
933		984
934	(ISSET_PIXCOLOR (Color_pointer_fg)	985	(ISSET_PIXCOLOR (Color_pointer_fg)
935	? pix_colors_focused[Color_pointer_fg]	986	? pix_colors_focused[Color_pointer_fg]
…		…
964		1015
965	for (i = Color_Black; i <= Color_White; i++)	1016	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_bg] == pix_colors[i])	1017	if (pix_colors[Color_bg] == pix_colors[i])
967	{	1018	{
968	sprintf (bstr, "%d", i - Color_Black);	1019	sprintf (bstr, "%d", i - Color_Black);
969	#ifdef BG_IMAGE_FROM_FILE	1020	#if HAVE_IMG
970	xpmb = "default;";	1021	xpmb = "default;";
971	#endif	1022	#endif
972	break;	1023	break;
973	}	1024	}
974		1025
…		…
990	}	1041	}
991		1042
992	void	1043	void
993	rxvt_term::alias_color (int dst, int src)	1044	rxvt_term::alias_color (int dst, int src)
994	{	1045	{
		1046	pix_colors[dst].free (this);
995	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);	1047	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
996	}	1048	}
		1049
		1050	#ifdef SMART_RESIZE
		1051	static unsigned int
		1052	get_parent_bw (Display *dpy, Window w)
		1053	{
		1054	int idummy;
		1055	unsigned int udummy;
		1056	Window wdummy, parent;
		1057	Window *children;
		1058	unsigned int nchildren, border_width;
		1059
		1060	XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
		1061	XFree (children);
		1062	XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
		1063	&udummy, &udummy, &border_width, &udummy);
		1064
		1065	return border_width;
		1066	}
		1067	#endif
997		1068
998	/* -------------------------------------------------------------------- *	1069	/* -------------------------------------------------------------------- *
999	* - WINDOW RESIZING - *	1070	* - WINDOW RESIZING - *
1000	* -------------------------------------------------------------------- */	1071	* -------------------------------------------------------------------- */
1001	void	1072	void
…		…
1037	* if display->root isn't the parent window, a WM will probably have offset	1108	* if display->root isn't the parent window, a WM will probably have offset
1038	* our position for handles and decorations. Counter it	1109	* our position for handles and decorations. Counter it
1039	*/	1110	*/
1040	if (x1 != x \|\| y1 != y)	1111	if (x1 != x \|\| y1 != y)
1041	{	1112	{
1042	x -= x1;	1113	unsigned int border_width = get_parent_bw (dpy, parent);
1043	y -= y1;	1114
		1115	x -= x1 + border_width;
		1116	y -= y1 + border_width;
1044	}	1117	}
1045		1118
1046	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1119	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1047	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1120	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1048	dx = old_width - szHint.width;	1121	dx = old_width - szHint.width;
…		…
1077		1150
1078	XMoveResizeWindow (dpy, vt,	1151	XMoveResizeWindow (dpy, vt,
1079	window_vt_x, window_vt_y,	1152	window_vt_x, window_vt_y,
1080	vt_width, vt_height);	1153	vt_width, vt_height);
1081		1154
1082	#ifdef HAVE_BG_PIXMAP	1155	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1083	if (bg_window_size_sensitive ())
1084	update_background ();
1085	#endif
1086	}	1156	}
1087		1157
1088	if (fix_screen \|\| old_height == 0)	1158	if (fix_screen \|\| old_height == 0)
1089	scr_reset ();	1159	scr_reset ();
1090		1160
1091	#ifdef USE_XIM	1161	#if USE_XIM
1092	im_set_position ();	1162	im_set_position ();
1093	#endif	1163	#endif
1094	}	1164	}
1095		1165
1096	/*	1166	/*
…		…
1121	}	1191	}
1122		1192
1123	/* -------------------------------------------------------------------- *	1193	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1194	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1195	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1196	#if USE_XIM
1127		1197
1128	void	1198	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1199	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1200	{
1131	fg = pix_colors [Color_fg];	1201	fg = pix_colors [Color_fg];
…		…
1311	unsigned long fg, bg;	1381	unsigned long fg, bg;
1312	const char *p;	1382	const char *p;
1313	char **s;	1383	char **s;
1314	XIMStyles *xim_styles;	1384	XIMStyles *xim_styles;
1315		1385
1316	set_environ (envv);	1386	set_environ (env);
1317		1387
1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1388	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319	return false;	1389	return false;
1320		1390
1321	input_method = display->get_xim (locale, modifiers);	1391	input_method = display->get_xim (locale, modifiers);
1322	if (input_method == NULL)	1392	if (input_method == NULL)
1323	return false;	1393	return false;
…		…
1528	im_destroy ();	1598	im_destroy ();
1529		1599
1530	if (Input_Context)	1600	if (Input_Context)
1531	return;	1601	return;
1532		1602
1533	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1534	if (rs[Rs_imLocale])	1603	if (rs[Rs_imLocale])
1535	SET_LOCALE (rs[Rs_imLocale]);	1604	SET_LOCALE (rs[Rs_imLocale]);
1536	#endif
1537		1605
1538	p = rs[Rs_inputMethod];	1606	p = rs[Rs_inputMethod];
1539	if (p && *p)	1607	if (p && *p)
1540	{	1608	{
1541	bool found = false;	1609	bool found = false;
…		…
1569	/* try with no modifiers base IF the user didn't specify an IM */	1637	/* try with no modifiers base IF the user didn't specify an IM */
1570	if (im_get_ic ("@im=none"))	1638	if (im_get_ic ("@im=none"))
1571	goto done;	1639	goto done;
1572		1640
1573	done:	1641	done:
1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1575	if (rs[Rs_imLocale])	1642	if (rs[Rs_imLocale])
1576	SET_LOCALE (locale);	1643	SET_LOCALE (locale);
1577	#endif
1578	}	1644	}
1579		1645
1580	void	1646	void
1581	rxvt_term::im_set_position ()	1647	rxvt_term::im_set_position ()
1582	{	1648	{
…		…
1627	{	1693	{
1628	Window cr;	1694	Window cr;
1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1695	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630	}	1696	}
1631		1697
1632	Pixmap
1633	rxvt_term::get_pixmap_property (Atom property)
1634	{
1635	Pixmap pixmap = None;
1636
1637	int aformat;
1638	unsigned long nitems, bytes_after;
1639	Atom atype;
1640	unsigned char *prop;
1641	int result = XGetWindowProperty (dpy, display->root, property,
1642	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643	&nitems, &bytes_after, &prop);
1644	if (result == Success)
1645	{
1646	if (atype == XA_PIXMAP)
1647	pixmap = (Pixmap )prop;
1648	XFree (prop);
1649	}
1650
1651	return pixmap;
1652	}
1653
1654	#ifdef HAVE_BG_PIXMAP
1655
1656	void
1657	rxvt_term::update_background ()
1658	{
1659	if (update_background_ev.is_active ())
1660	return;
1661
1662	bg_invalidate ();
1663
1664	if (!mapped)
1665	return;
1666
1667	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668
1669	if (to_wait <= 0.)
1670	bg_render ();
1671	else
1672	update_background_ev.start (to_wait);
1673	}
1674
1675	void
1676	rxvt_term::update_background_cb (ev::timer &w, int revents)
1677	{
1678	make_current ();
1679
1680	update_background_ev.stop ();
1681	bg_render ();
1682	refresh_check ();
1683	}
1684
1685	#endif /* HAVE_BG_PIXMAP */
1686
1687	/----------------------- end-of-file (C source) -----------------------/	1698	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs. Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.366 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 UTC