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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 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
…		…
105	if (cc->c2 == c2) return c1;	104	if (cc->c2 == c2) return c1;
106	cc = (*this)[cc->c1];	105	cc = (*this)[cc->c1];
107	}	106	}
108		107
109	// check to see whether this combination already exists otherwise	108	// check to see whether this combination already exists otherwise
110	for (cc = v.end (); cc-- > v.begin (); )	109	for (cc = v.begin (); cc < v.end (); cc++)
111	if (cc->c1 == c1 && cc->c2 == c2)	110	if (cc->c1 == c1 && cc->c2 == c2)
112	return COMPOSE_LO + (cc - v.begin ());	111	return COMPOSE_LO + (cc - v.begin ());
113		112
114	// allocate a new combination	113	// allocate a new combination
115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
…		…
170	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171	#endif	170	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174	#endif	173	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	176	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	178	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	180	#endif
182	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	183	#endif
…		…
228		227
229	#ifdef HAVE_BG_PIXMAP	228	#ifdef HAVE_BG_PIXMAP
230	bg_destroy ();	229	bg_destroy ();
231	#endif	230	#endif
232		231
		232	#if HAVE_IMG
		233	delete bg_img;
		234	#endif
		235
233	if (display)	236	if (display)
234	{	237	{
235	selection_clear ();	238	selection_clear ();
236	selection_clear (true);	239	selection_clear (true);
237		240
238	#ifdef USE_XIM	241	#if USE_XIM
239	im_destroy ();	242	im_destroy ();
240	#endif	243	#endif
241	scrollBar.destroy ();	244	scrollBar.destroy ();
		245
		246	if (gc)
242	if (gc) XFreeGC (dpy, gc);	247	XFreeGC (dpy, gc);
243		248
244	delete drawable;	249	delete drawable;
		250
245	// destroy all windows	251	// destroy all windows
246	if (parent)	252	if (parent)
247	XDestroyWindow (dpy, parent);	253	XDestroyWindow (dpy, parent);
248		254
249	for (int i = 0; i < TOTAL_COLORS; i++)	255	for (int i = 0; i < TOTAL_COLORS; i++)
250	if (ISSET_PIXCOLOR (i))	256	if (ISSET_PIXCOLOR (i))
251	{	257	{
252	pix_colors_focused [i].free (this);	258	pix_colors_focused [i].free (this);
253	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
		260	if (rs[Rs_fade])
254	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
255	#endif	262	#endif
256	}	263	}
257		264
258	clear ();	265	clear ();
259		266
…		…
267	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
268	free (allocated [i]);	275	free (allocated [i]);
269		276
270	free (selection.text);	277	free (selection.text);
271	free (selection.clip_text);	278	free (selection.clip_text);
272	// TODO: manage env vars in child only(!)
273	free (env_display);
274	free (env_term);
275	free (locale);	279	free (locale);
276	free (v_buffer);	280	free (v_buffer);
277		281
278	delete selection_req;	282	delete selection_req;
279		283
		284	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		285	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		286
		287	delete [] env;
		288
280	delete envv;	289	delete envv;
281	delete argv;	290	delete argv;
282		291
283	#ifdef KEYSYM_RESOURCE	292	#ifdef KEYSYM_RESOURCE
284	delete keyboard;	293	delete keyboard;
285	#endif	294	#endif
286	#ifndef NO_RESOURCES	295	#ifndef NO_RESOURCES
287	XrmDestroyDatabase (option_db);	296	XrmDestroyDatabase (option_db);
288	#endif	297	#endif
		298
		299	SET_R ((rxvt_term *)0);
289	}	300	}
290		301
291	// child has exited, usually destroys	302	// child has exited, usually destroys
292	void	303	void
293	rxvt_term::child_cb (ev::child &w, int status)	304	rxvt_term::child_cb (ev::child &w, int status)
…		…
316	{	327	{
317	#if USE_XIM	328	#if USE_XIM
318	im_ev.stop (display);	329	im_ev.stop (display);
319	#endif	330	#endif
320	scrollbar_ev.stop (display);	331	scrollbar_ev.stop (display);
321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	332	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
322	rootwin_ev.stop (display);	333	rootwin_ev.stop (display);
323	#endif	334	#endif
324	termwin_ev.stop (display);	335	termwin_ev.stop (display);
325	vt_ev.stop (display);	336	vt_ev.stop (display);
326	}	337	}
…		…
353		364
354	delete this;	365	delete this;
355	}	366	}
356		367
357	void	368	void
358	rxvt_term::set_option (uint8_t opt, bool set)	369	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359	{	370	{
360	if (!opt)	371	if (!opt)
361	return;	372	return;
362		373
363	uint8_t mask = 1 << (opt & 7);	374	uint8_t mask = 1 << (opt & 7);
…		…
367	}	378	}
368		379
369	/----------------------------------------------------------------------/	380	/----------------------------------------------------------------------/
370	/*	381	/*
371	* Exit gracefully, clearing the utmp entry and restoring tty attributes	382	* Exit gracefully, clearing the utmp entry and restoring tty attributes
372	* TODO: if debugging, this should free up any known resources if we can
373	*/	383	*/
374	static XErrorHandler old_xerror_handler;	384	static XErrorHandler old_xerror_handler;
375		385
376	static void	386	static void
377	rxvt_emergency_cleanup ()	387	rxvt_emergency_cleanup ()
…		…
379	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	389	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380	(*t)->emergency_cleanup ();	390	(*t)->emergency_cleanup ();
381	}	391	}
382		392
383	#if !ENABLE_MINIMAL	393	#if !ENABLE_MINIMAL
384	static void	394	static void ecb_cold
385	print_x_error (Display dpy, XErrorEvent event)	395	print_x_error (Display dpy, XErrorEvent event)
386	{	396	{
387	char buffer[BUFSIZ];	397	char buffer[BUFSIZ];
388	char mesg[BUFSIZ];	398	char mesg[BUFSIZ];
389	char number[32];	399	char number[32];
390	const char mtype[] = "XlibMessage";	400
391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	401	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		402
		403	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		404	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		405
		406	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		407	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394	rxvt_warn ("%s: %s\n", mesg, buffer);	408	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		409
395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	410	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	411	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		412
		413	if (event->request_code >= 128)
		414	{
		415	#if 0
		416	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		417	int nexts;
		418	char **exts = XListExtensions (dpy, &nexts);
		419
		420	while (nexts)
		421	{
		422	char *extname = exts [nexts - 1];
		423	int major, first_event, first_error;
		424
		425	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		426	{
		427	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		428	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		429
		430	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		431	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		432	rxvt_warn ("+ (which is %s)\n", buffer);
		433
		434	break;
		435	}
		436
		437	printf ("nextss %d %s\n", nexts, extname);//D
		438	--nexts;
		439	++exts;
		440	}
		441	#else
		442	int nexts = 0;
		443	char **exts = 0;
		444	#endif
		445
		446	if (!nexts)
		447	{
		448	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		449
		450	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		451	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		452
		453	#if 0
		454	sprintf (number, "RENDER.%d", event->minor_code);
		455	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		456	rxvt_warn ("+ (which is %s)\n", buffer);
		457	#endif
		458	}
		459
		460	XFreeExtensionList (exts);
		461	}
		462	else
		463	{
397	sprintf(number, "%d", event->request_code);	464	sprintf (number, "%d", event->request_code);
398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	465	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399	rxvt_warn ("(which is %s)\n", buffer);	466	rxvt_warn ("+ (which is %s)\n", buffer);
400	if (event->request_code >= 128) {
401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
402	mesg, BUFSIZ);
403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404	}	467	}
		468
405	if ((event->error_code == BadWindow) \|\|	469	if (event->error_code == BadWindow
406	(event->error_code == BadPixmap) \|\|	470	\|\| event->error_code == BadPixmap
407	(event->error_code == BadCursor) \|\|	471	\|\| event->error_code == BadCursor
408	(event->error_code == BadFont) \|\|	472	\|\| event->error_code == BadFont
409	(event->error_code == BadDrawable) \|\|	473	\|\| event->error_code == BadDrawable
410	(event->error_code == BadColor) \|\|	474	\|\| event->error_code == BadColor
411	(event->error_code == BadGC) \|\|	475	\|\| event->error_code == BadGC
412	(event->error_code == BadIDChoice) \|\|	476	\|\| event->error_code == BadIDChoice
413	(event->error_code == BadValue) \|\|	477	\|\| event->error_code == BadValue
414	(event->error_code == BadAtom)) {	478	\|\| event->error_code == BadAtom)
		479	{
415	if (event->error_code == BadValue)	480	if (event->error_code == BadValue)
416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	481	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else if (event->error_code == BadAtom)	482	else if (event->error_code == BadAtom)
419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	483	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	else	484	else
422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	485	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423	mesg, BUFSIZ);
424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425	}
426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429	}
430	#endif
431		486
432	int	487	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		488	}
		489	}
		490	#endif
		491
		492	int ecb_cold
433	rxvt_xerror_handler (Display display, XErrorEvent event)	493	rxvt_xerror_handler (Display display, XErrorEvent event)
434	{	494	{
435	if (GET_R->allowedxerror == -1)	495	if (GET_R && GET_R->allowedxerror == -1)
436	GET_R->allowedxerror = event->error_code;	496	GET_R->allowedxerror = event->error_code;
437	else	497	else
438	{	498	{
439	// GET_R is most likely not the terminal which caused the error,	499	// GET_R is most likely not the terminal which caused the error,
440	// so just output the error and continue	500	// so just output the error and continue
…		…
446	}	506	}
447		507
448	return 0;	508	return 0;
449	}	509	}
450		510
451	int	511	int ecb_cold
452	rxvt_xioerror_handler (Display *display)	512	rxvt_xioerror_handler (Display *display)
453	{	513	{
454	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	514	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455	DisplayString (display));	515	DisplayString (display));
456	rxvt_emergency_cleanup ();	516	rxvt_emergency_cleanup ();
…		…
576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
578	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
579		639
580	XrmInitialize ();	640	XrmInitialize ();
		641
		642	#if HAVE_PIXBUF
		643	g_type_init ();
		644	#endif
581	}	645	}
582		646
583	/----------------------------------------------------------------------/	647	/----------------------------------------------------------------------/
584	/*	648	/*
585	* window size/position calculations for XSizeHint and other storage.	649	* window size/position calculations for XSizeHint and other storage.
…		…
706	if (recalc_y)	770	if (recalc_y)
707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	771	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708		772
709	ncol = width / fwidth;	773	ncol = width / fwidth;
710	nrow = height / fheight;	774	nrow = height / fheight;
		775
		776	// When the size of the vt window is not a multiple of the cell
		777	// size, i.e., when the wm does not honour our size hints, there are
		778	// extra areas not covered by the terminal screen. Such gaps, when a
		779	// bg pixmap is set, would have to be cleared manually to properly
		780	// refresh the background. We take the simpler route and shrink the
		781	// vt window so as to avoid creating gaps.
		782	vt_width = ncol * fwidth;
		783	vt_height = nrow * fheight;
711	}	784	}
712		785
713	/----------------------------------------------------------------------/	786	/----------------------------------------------------------------------/
714	/*	787	/*
715	* Tell the teletype handler what size the window is.	788	* Tell the teletype handler what size the window is.
…		…
723		796
724	struct winsize ws;	797	struct winsize ws;
725		798
726	ws.ws_col = ncol;	799	ws.ws_col = ncol;
727	ws.ws_row = nrow;	800	ws.ws_row = nrow;
728	ws.ws_xpixel = width;	801	ws.ws_xpixel = vt_width;
729	ws.ws_ypixel = height;	802	ws.ws_ypixel = vt_height;
730	ioctl (pty->pty, TIOCSWINSZ, &ws);	803	ioctl (pty->pty, TIOCSWINSZ, &ws);
731		804
732	#if 0	805	#if 0
733	// TIOCSWINSZ is supposed to do this automatically and correctly	806	// TIOCSWINSZ is supposed to do this automatically and correctly
734	if (cmd_pid) /* force through to the command */	807	if (cmd_pid) /* force through to the command */
…		…
760		833
761	delete fontset[0];	834	delete fontset[0];
762	fontset[0] = fs;	835	fontset[0] = fs;
763		836
764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	837	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765	prop.height += lineSpace;	838	prop.width = max (prop.width + letterSpace, 1);
766	prop.width += letterSpace;
767		839
768	fs->set_prop (prop, false);	840	fs->set_prop (prop, false);
769		841
770	fwidth = prop.width;	842	fwidth = prop.width;
771	fheight = prop.height;	843	fheight = prop.height + lineSpace;
772	fbase = prop.ascent;	844	fbase = prop.ascent;
773		845
774	for (int style = 1; style < 4; style++)	846	for (int style = 1; style < 4; style++)
775	{	847	{
776	#if ENABLE_STYLES	848	#if ENABLE_STYLES
…		…
871		943
872	void	944	void
873	rxvt_term::set_window_color (int idx, const char *color)	945	rxvt_term::set_window_color (int idx, const char *color)
874	{	946	{
875	#ifdef XTERM_COLOR_CHANGE	947	#ifdef XTERM_COLOR_CHANGE
876	rxvt_color xcol;
877
878	if (color == NULL \|\| *color == '\0')	948	if (color == NULL \|\| *color == '\0')
879	return;	949	return;
880		950
881	color = strdup (color);	951	color = strdup (color);
882	allocated.push_back ((void *)color);	952	allocated.push_back ((void *)color);
…		…
888	int i = atoi (color);	958	int i = atoi (color);
889		959
890	if (i >= 8 && i <= 15)	960	if (i >= 8 && i <= 15)
891	{	961	{
892	/* bright colors */	962	/* bright colors */
893	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	963	alias_color (idx, minBrightCOLOR + i - 8);
894	goto done;	964	goto done;
895	}	965	}
896		966
897	if (i >= 0 && i <= 7)	967	if (i >= 0 && i <= 7)
898	{	968	{
899	/* normal colors */	969	/* normal colors */
900	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	970	alias_color (idx, minCOLOR + i);
901	goto done;	971	goto done;
902	}	972	}
903	}	973	}
904		974
905	set_color (xcol, color);	975	pix_colors_focused[idx].free (this);
906		976	set_color (pix_colors_focused[idx], color);
907	/*
908	* FIXME: should free colors here, but no idea how to do it so instead,
909	* so just keep gobbling up the colormap
910	*/
911
912	pix_colors_focused[idx] = xcol;
913		977
914	done:	978	done:
915	/TODO: handle Color_BD, scrollbar background, etc. /	979	/TODO: handle Color_BD, scrollbar background, etc. /
916		980
917	update_fade_color (idx);	981	update_fade_color (idx);
918	recolour_cursor ();	982	recolor_cursor ();
919	scr_recolour ();	983	scr_recolor ();
920	#endif /* XTERM_COLOR_CHANGE */	984	#endif /* XTERM_COLOR_CHANGE */
921	}	985	}
922		986
923	void	987	void
924	rxvt_term::recolour_cursor ()	988	rxvt_term::recolor_cursor ()
925	{	989	{
926	XColor fg, bg;	990	XColor fg, bg;
927		991
928	(ISSET_PIXCOLOR (Color_pointer_fg)	992	(ISSET_PIXCOLOR (Color_pointer_fg)
929	? pix_colors_focused[Color_pointer_fg]	993	? pix_colors_focused[Color_pointer_fg]
…		…
938		1002
939	/----------------------------------------------------------------------/	1003	/----------------------------------------------------------------------/
940	/*	1004	/*
941	* find if fg/bg matches any of the normal (low-intensity) colors	1005	* find if fg/bg matches any of the normal (low-intensity) colors
942	*/	1006	*/
943	void	1007	char *
944	rxvt_term::set_colorfgbg ()	1008	rxvt_term::get_colorfgbg ()
945	{	1009	{
946	unsigned int i;	1010	unsigned int i;
947	const char *xpmb = "";	1011	const char *xpmb = "";
948	char fstr[] = "default";	1012	char fstr[] = "default";
949	char bstr[] = "default";	1013	char bstr[] = "default";
		1014	char *env_colorfgbg;
950		1015
951	for (i = Color_Black; i <= Color_White; i++)	1016	for (i = Color_Black; i <= Color_White; i++)
952	if (pix_colors[Color_fg] == pix_colors[i])	1017	if (pix_colors[Color_fg] == pix_colors[i])
953	{	1018	{
954	sprintf (fstr, "%d", i - Color_Black);	1019	sprintf (fstr, "%d", i - Color_Black);
…		…
957		1022
958	for (i = Color_Black; i <= Color_White; i++)	1023	for (i = Color_Black; i <= Color_White; i++)
959	if (pix_colors[Color_bg] == pix_colors[i])	1024	if (pix_colors[Color_bg] == pix_colors[i])
960	{	1025	{
961	sprintf (bstr, "%d", i - Color_Black);	1026	sprintf (bstr, "%d", i - Color_Black);
962	#ifdef BG_IMAGE_FROM_FILE	1027	#if BG_IMAGE_FROM_FILE
963	xpmb = "default;";	1028	xpmb = "default;";
964	#endif	1029	#endif
965	break;	1030	break;
966	}	1031	}
967		1032
		1033	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
968	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1034	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		1035	return env_colorfgbg;
969	}	1036	}
970		1037
971	/----------------------------------------------------------------------/	1038	/----------------------------------------------------------------------/
972		1039
973	bool	1040	bool
…		…
981	}	1048	}
982		1049
983	void	1050	void
984	rxvt_term::alias_color (int dst, int src)	1051	rxvt_term::alias_color (int dst, int src)
985	{	1052	{
		1053	pix_colors[dst].free (this);
986	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);	1054	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
987	}	1055	}
		1056
		1057	#ifdef SMART_RESIZE
		1058	static unsigned int
		1059	get_parent_bw (Display *dpy, Window w)
		1060	{
		1061	int idummy;
		1062	unsigned int udummy;
		1063	Window wdummy, parent;
		1064	Window *children;
		1065	unsigned int nchildren, border_width;
		1066
		1067	XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
		1068	XFree (children);
		1069	XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
		1070	&udummy, &udummy, &border_width, &udummy);
		1071
		1072	return border_width;
		1073	}
		1074	#endif
988		1075
989	/* -------------------------------------------------------------------- *	1076	/* -------------------------------------------------------------------- *
990	* - WINDOW RESIZING - *	1077	* - WINDOW RESIZING - *
991	* -------------------------------------------------------------------- */	1078	* -------------------------------------------------------------------- */
992	void	1079	void
…		…
1028	* if display->root isn't the parent window, a WM will probably have offset	1115	* if display->root isn't the parent window, a WM will probably have offset
1029	* our position for handles and decorations. Counter it	1116	* our position for handles and decorations. Counter it
1030	*/	1117	*/
1031	if (x1 != x \|\| y1 != y)	1118	if (x1 != x \|\| y1 != y)
1032	{	1119	{
1033	x -= x1;	1120	unsigned int border_width = get_parent_bw (dpy, parent);
1034	y -= y1;	1121
		1122	x -= x1 + border_width;
		1123	y -= y1 + border_width;
1035	}	1124	}
1036		1125
1037	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1126	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1038	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1127	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1039	dx = old_width - szHint.width;	1128	dx = old_width - szHint.width;
…		…
1066	if (scrollBar.state)	1155	if (scrollBar.state)
1067	scrollBar.resize ();	1156	scrollBar.resize ();
1068		1157
1069	XMoveResizeWindow (dpy, vt,	1158	XMoveResizeWindow (dpy, vt,
1070	window_vt_x, window_vt_y,	1159	window_vt_x, window_vt_y,
1071	width, height);	1160	vt_width, vt_height);
		1161
		1162	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1072		1163
1073	#ifdef HAVE_BG_PIXMAP	1164	#ifdef HAVE_BG_PIXMAP
1074	if (bg_window_size_sensitive ())	1165	if (bg_window_size_sensitive ())
1075	update_background ();	1166	update_background ();
1076	#endif	1167	#endif
1077	}	1168	}
1078		1169
1079	if (fix_screen \|\| old_height == 0)	1170	if (fix_screen \|\| old_height == 0)
1080	scr_reset ();	1171	scr_reset ();
1081		1172
1082	#ifdef USE_XIM	1173	#if USE_XIM
1083	im_set_position ();	1174	im_set_position ();
1084	#endif	1175	#endif
1085	}	1176	}
1086		1177
1087	/*	1178	/*
…		…
1101	newwidth = wattr.width - szHint.base_width;	1192	newwidth = wattr.width - szHint.base_width;
1102	if (newheight == 0)	1193	if (newheight == 0)
1103	newheight = wattr.height - szHint.base_height;	1194	newheight = wattr.height - szHint.base_height;
1104	}	1195	}
1105		1196
1106	if (newwidth != width \|\| newheight != height)	1197	if (newwidth != vt_width \|\| newheight != vt_height)
1107	{	1198	{
1108	newwidth += szHint.base_width;	1199	newwidth += szHint.base_width;
1109	newheight += szHint.base_height;	1200	newheight += szHint.base_height;
1110	resize_all_windows (newwidth, newheight, 0);	1201	resize_all_windows (newwidth, newheight, 0);
1111	}	1202	}
1112	}	1203	}
1113		1204
1114	/* -------------------------------------------------------------------- *	1205	/* -------------------------------------------------------------------- *
1115	* - X INPUT METHOD ROUTINES - *	1206	* - X INPUT METHOD ROUTINES - *
1116	* -------------------------------------------------------------------- */	1207	* -------------------------------------------------------------------- */
1117	#ifdef USE_XIM	1208	#if USE_XIM
1118		1209
1119	void	1210	void
1120	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1211	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1121	{	1212	{
1122	fg = pix_colors [Color_fg];	1213	fg = pix_colors [Color_fg];
…		…
1302	unsigned long fg, bg;	1393	unsigned long fg, bg;
1303	const char *p;	1394	const char *p;
1304	char **s;	1395	char **s;
1305	XIMStyles *xim_styles;	1396	XIMStyles *xim_styles;
1306		1397
1307	set_environ (envv);	1398	set_environ (env);
1308		1399
1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1400	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1310	return false;	1401	return false;
1311		1402
1312	input_method = display->get_xim (locale, modifiers);	1403	input_method = display->get_xim (locale, modifiers);
1313	if (input_method == NULL)	1404	if (input_method == NULL)
1314	return false;	1405	return false;
…		…
1519	im_destroy ();	1610	im_destroy ();
1520		1611
1521	if (Input_Context)	1612	if (Input_Context)
1522	return;	1613	return;
1523		1614
1524	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1525	if (rs[Rs_imLocale])	1615	if (rs[Rs_imLocale])
1526	SET_LOCALE (rs[Rs_imLocale]);	1616	SET_LOCALE (rs[Rs_imLocale]);
1527	#endif
1528		1617
1529	p = rs[Rs_inputMethod];	1618	p = rs[Rs_inputMethod];
1530	if (p && *p)	1619	if (p && *p)
1531	{	1620	{
1532	bool found = false;	1621	bool found = false;
…		…
1560	/* try with no modifiers base IF the user didn't specify an IM */	1649	/* try with no modifiers base IF the user didn't specify an IM */
1561	if (im_get_ic ("@im=none"))	1650	if (im_get_ic ("@im=none"))
1562	goto done;	1651	goto done;
1563		1652
1564	done:	1653	done:
1565	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1566	if (rs[Rs_imLocale])	1654	if (rs[Rs_imLocale])
1567	SET_LOCALE (locale);	1655	SET_LOCALE (locale);
1568	#endif
1569	}	1656	}
1570		1657
1571	void	1658	void
1572	rxvt_term::im_set_position ()	1659	rxvt_term::im_set_position ()
1573	{	1660	{
…		…
1618	{	1705	{
1619	Window cr;	1706	Window cr;
1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1707	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1621	}	1708	}
1622		1709
1623	Pixmap
1624	rxvt_term::get_pixmap_property (Atom property)
1625	{
1626	Pixmap pixmap = None;
1627
1628	int aformat;
1629	unsigned long nitems, bytes_after;
1630	Atom atype;
1631	unsigned char *prop;
1632	int result = XGetWindowProperty (dpy, display->root, property,
1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1634	&nitems, &bytes_after, &prop);
1635	if (result == Success)
1636	{
1637	if (atype == XA_PIXMAP)
1638	pixmap = (Pixmap )prop;
1639	XFree (prop);
1640	}
1641
1642	return pixmap;
1643	}
1644
1645	#ifdef HAVE_BG_PIXMAP	1710	#ifdef HAVE_BG_PIXMAP
1646		1711
1647	void	1712	void
1648	rxvt_term::update_background ()	1713	rxvt_term::update_background ()
1649	{	1714	{
1650	if (update_background_ev.is_active ())	1715	if (update_background_ev.is_active ())
1651	return;	1716	return;
1652
1653	bg_invalidate ();
1654		1717
1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1718	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1656		1719
1657	if (to_wait <= 0.)	1720	if (to_wait <= 0.)
1658	bg_render ();	1721	bg_render ();

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC vs. Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC