[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.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
…		…
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
…		…
272	free (locale);	279	free (locale);
273	free (v_buffer);	280	free (v_buffer);
274		281
275	delete selection_req;	282	delete selection_req;
276		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
277	delete envv;	289	delete envv;
278	delete argv;	290	delete argv;
279		291
280	#ifdef KEYSYM_RESOURCE	292	#ifdef KEYSYM_RESOURCE
281	delete keyboard;	293	delete keyboard;
282	#endif	294	#endif
283	#ifndef NO_RESOURCES	295	#ifndef NO_RESOURCES
284	XrmDestroyDatabase (option_db);	296	XrmDestroyDatabase (option_db);
285	#endif	297	#endif
		298
		299	SET_R ((rxvt_term *)0);
286	}	300	}
287		301
288	// child has exited, usually destroys	302	// child has exited, usually destroys
289	void	303	void
290	rxvt_term::child_cb (ev::child &w, int status)	304	rxvt_term::child_cb (ev::child &w, int status)
…		…
313	{	327	{
314	#if USE_XIM	328	#if USE_XIM
315	im_ev.stop (display);	329	im_ev.stop (display);
316	#endif	330	#endif
317	scrollbar_ev.stop (display);	331	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	332	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	333	rootwin_ev.stop (display);
320	#endif	334	#endif
321	termwin_ev.stop (display);	335	termwin_ev.stop (display);
322	vt_ev.stop (display);	336	vt_ev.stop (display);
323	}	337	}
…		…
350		364
351	delete this;	365	delete this;
352	}	366	}
353		367
354	void	368	void
355	rxvt_term::set_option (uint8_t opt, bool set)	369	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356	{	370	{
357	if (!opt)	371	if (!opt)
358	return;	372	return;
359		373
360	uint8_t mask = 1 << (opt & 7);	374	uint8_t mask = 1 << (opt & 7);
…		…
364	}	378	}
365		379
366	/----------------------------------------------------------------------/	380	/----------------------------------------------------------------------/
367	/*	381	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	382	* 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	*/	383	*/
371	static XErrorHandler old_xerror_handler;	384	static XErrorHandler old_xerror_handler;
372		385
373	static void	386	static void
374	rxvt_emergency_cleanup ()	387	rxvt_emergency_cleanup ()
…		…
376	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++)
377	(*t)->emergency_cleanup ();	390	(*t)->emergency_cleanup ();
378	}	391	}
379		392
380	#if !ENABLE_MINIMAL	393	#if !ENABLE_MINIMAL
381	static void	394	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	395	print_x_error (Display dpy, XErrorEvent event)
383	{	396	{
384	char buffer[BUFSIZ];	397	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	398	char mesg[BUFSIZ];
386	char number[32];	399	char number[32];
387	const char mtype[] = "XlibMessage";	400
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");	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);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	408	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		409
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	410	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	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	{
394	sprintf(number, "%d", event->request_code);	464	sprintf (number, "%d", event->request_code);
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	465	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);	466	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	}	467	}
		468
402	if ((event->error_code == BadWindow) \|\|	469	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	470	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	471	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	472	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	473	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	474	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	475	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	476	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	477	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	478	\|\| event->error_code == BadAtom)
		479	{
412	if (event->error_code == BadValue)	480	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	481	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	482	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	483	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	484	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	485	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		486
429	int	487	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		488	}
		489	}
		490	#endif
		491
		492	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	493	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	494	{
432	if (GET_R->allowedxerror == -1)	495	if (GET_R && GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	496	GET_R->allowedxerror = event->error_code;
434	else	497	else
435	{	498	{
436	// 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,
437	// so just output the error and continue	500	// so just output the error and continue
…		…
443	}	506	}
444		507
445	return 0;	508	return 0;
446	}	509	}
447		510
448	int	511	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	512	rxvt_xioerror_handler (Display *display)
450	{	513	{
451	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",
452	DisplayString (display));	515	DisplayString (display));
453	rxvt_emergency_cleanup ();	516	rxvt_emergency_cleanup ();
…		…
573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
575	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
576		639
577	XrmInitialize ();	640	XrmInitialize ();
		641
		642	#if HAVE_PIXBUF
		643	g_type_init ();
		644	#endif
578	}	645	}
579		646
580	/----------------------------------------------------------------------/	647	/----------------------------------------------------------------------/
581	/*	648	/*
582	* window size/position calculations for XSizeHint and other storage.	649	* window size/position calculations for XSizeHint and other storage.
…		…
766		833
767	delete fontset[0];	834	delete fontset[0];
768	fontset[0] = fs;	835	fontset[0] = fs;
769		836
770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	837	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771	prop.height += lineSpace;	838	prop.width = max (prop.width + letterSpace, 1);
772	prop.width += letterSpace;
773		839
774	fs->set_prop (prop, false);	840	fs->set_prop (prop, false);
775		841
776	fwidth = prop.width;	842	fwidth = prop.width;
777	fheight = prop.height;	843	fheight = prop.height + lineSpace;
778	fbase = prop.ascent;	844	fbase = prop.ascent;
779		845
780	for (int style = 1; style < 4; style++)	846	for (int style = 1; style < 4; style++)
781	{	847	{
782	#if ENABLE_STYLES	848	#if ENABLE_STYLES
…		…
877		943
878	void	944	void
879	rxvt_term::set_window_color (int idx, const char *color)	945	rxvt_term::set_window_color (int idx, const char *color)
880	{	946	{
881	#ifdef XTERM_COLOR_CHANGE	947	#ifdef XTERM_COLOR_CHANGE
882	rxvt_color xcol;
883
884	if (color == NULL \|\| *color == '\0')	948	if (color == NULL \|\| *color == '\0')
885	return;	949	return;
886		950
887	color = strdup (color);	951	color = strdup (color);
888	allocated.push_back ((void *)color);	952	allocated.push_back ((void *)color);
…		…
894	int i = atoi (color);	958	int i = atoi (color);
895		959
896	if (i >= 8 && i <= 15)	960	if (i >= 8 && i <= 15)
897	{	961	{
898	/* bright colors */	962	/* bright colors */
899	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	963	alias_color (idx, minBrightCOLOR + i - 8);
900	goto done;	964	goto done;
901	}	965	}
902		966
903	if (i >= 0 && i <= 7)	967	if (i >= 0 && i <= 7)
904	{	968	{
905	/* normal colors */	969	/* normal colors */
906	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	970	alias_color (idx, minCOLOR + i);
907	goto done;	971	goto done;
908	}	972	}
909	}	973	}
910		974
911	set_color (xcol, color);	975	pix_colors_focused[idx].free (this);
912		976	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		977
920	done:	978	done:
921	/TODO: handle Color_BD, scrollbar background, etc. /	979	/TODO: handle Color_BD, scrollbar background, etc. /
922		980
923	update_fade_color (idx);	981	update_fade_color (idx);
924	recolour_cursor ();	982	recolor_cursor ();
925	scr_recolour ();	983	scr_recolor ();
926	#endif /* XTERM_COLOR_CHANGE */	984	#endif /* XTERM_COLOR_CHANGE */
927	}	985	}
928		986
929	void	987	void
930	rxvt_term::recolour_cursor ()	988	rxvt_term::recolor_cursor ()
931	{	989	{
932	XColor fg, bg;	990	XColor fg, bg;
933		991
934	(ISSET_PIXCOLOR (Color_pointer_fg)	992	(ISSET_PIXCOLOR (Color_pointer_fg)
935	? pix_colors_focused[Color_pointer_fg]	993	? pix_colors_focused[Color_pointer_fg]
…		…
964		1022
965	for (i = Color_Black; i <= Color_White; i++)	1023	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_bg] == pix_colors[i])	1024	if (pix_colors[Color_bg] == pix_colors[i])
967	{	1025	{
968	sprintf (bstr, "%d", i - Color_Black);	1026	sprintf (bstr, "%d", i - Color_Black);
969	#ifdef BG_IMAGE_FROM_FILE	1027	#if BG_IMAGE_FROM_FILE
970	xpmb = "default;";	1028	xpmb = "default;";
971	#endif	1029	#endif
972	break;	1030	break;
973	}	1031	}
974		1032
…		…
990	}	1048	}
991		1049
992	void	1050	void
993	rxvt_term::alias_color (int dst, int src)	1051	rxvt_term::alias_color (int dst, int src)
994	{	1052	{
		1053	pix_colors[dst].free (this);
995	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]);
996	}	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
997		1075
998	/* -------------------------------------------------------------------- *	1076	/* -------------------------------------------------------------------- *
999	* - WINDOW RESIZING - *	1077	* - WINDOW RESIZING - *
1000	* -------------------------------------------------------------------- */	1078	* -------------------------------------------------------------------- */
1001	void	1079	void
…		…
1037	* 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
1038	* our position for handles and decorations. Counter it	1116	* our position for handles and decorations. Counter it
1039	*/	1117	*/
1040	if (x1 != x \|\| y1 != y)	1118	if (x1 != x \|\| y1 != y)
1041	{	1119	{
1042	x -= x1;	1120	unsigned int border_width = get_parent_bw (dpy, parent);
1043	y -= y1;	1121
		1122	x -= x1 + border_width;
		1123	y -= y1 + border_width;
1044	}	1124	}
1045		1125
1046	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1126	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1047	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1127	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1048	dx = old_width - szHint.width;	1128	dx = old_width - szHint.width;
…		…
1077		1157
1078	XMoveResizeWindow (dpy, vt,	1158	XMoveResizeWindow (dpy, vt,
1079	window_vt_x, window_vt_y,	1159	window_vt_x, window_vt_y,
1080	vt_width, vt_height);	1160	vt_width, vt_height);
1081		1161
		1162	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1163
1082	#ifdef HAVE_BG_PIXMAP	1164	#ifdef HAVE_BG_PIXMAP
1083	if (bg_window_size_sensitive ())	1165	if (bg_window_size_sensitive ())
1084	update_background ();	1166	update_background ();
1085	#endif	1167	#endif
1086	}	1168	}
1087		1169
1088	if (fix_screen \|\| old_height == 0)	1170	if (fix_screen \|\| old_height == 0)
1089	scr_reset ();	1171	scr_reset ();
1090		1172
1091	#ifdef USE_XIM	1173	#if USE_XIM
1092	im_set_position ();	1174	im_set_position ();
1093	#endif	1175	#endif
1094	}	1176	}
1095		1177
1096	/*	1178	/*
…		…
1121	}	1203	}
1122		1204
1123	/* -------------------------------------------------------------------- *	1205	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1206	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1207	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1208	#if USE_XIM
1127		1209
1128	void	1210	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1211	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1212	{
1131	fg = pix_colors [Color_fg];	1213	fg = pix_colors [Color_fg];
…		…
1311	unsigned long fg, bg;	1393	unsigned long fg, bg;
1312	const char *p;	1394	const char *p;
1313	char **s;	1395	char **s;
1314	XIMStyles *xim_styles;	1396	XIMStyles *xim_styles;
1315		1397
1316	set_environ (envv);	1398	set_environ (env);
1317		1399
1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1400	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319	return false;	1401	return false;
1320		1402
1321	input_method = display->get_xim (locale, modifiers);	1403	input_method = display->get_xim (locale, modifiers);
1322	if (input_method == NULL)	1404	if (input_method == NULL)
1323	return false;	1405	return false;
…		…
1528	im_destroy ();	1610	im_destroy ();
1529		1611
1530	if (Input_Context)	1612	if (Input_Context)
1531	return;	1613	return;
1532		1614
1533	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1534	if (rs[Rs_imLocale])	1615	if (rs[Rs_imLocale])
1535	SET_LOCALE (rs[Rs_imLocale]);	1616	SET_LOCALE (rs[Rs_imLocale]);
1536	#endif
1537		1617
1538	p = rs[Rs_inputMethod];	1618	p = rs[Rs_inputMethod];
1539	if (p && *p)	1619	if (p && *p)
1540	{	1620	{
1541	bool found = false;	1621	bool found = false;
…		…
1569	/* 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 */
1570	if (im_get_ic ("@im=none"))	1650	if (im_get_ic ("@im=none"))
1571	goto done;	1651	goto done;
1572		1652
1573	done:	1653	done:
1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1575	if (rs[Rs_imLocale])	1654	if (rs[Rs_imLocale])
1576	SET_LOCALE (locale);	1655	SET_LOCALE (locale);
1577	#endif
1578	}	1656	}
1579		1657
1580	void	1658	void
1581	rxvt_term::im_set_position ()	1659	rxvt_term::im_set_position ()
1582	{	1660	{
…		…
1627	{	1705	{
1628	Window cr;	1706	Window cr;
1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1707	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630	}	1708	}
1631		1709
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	1710	#ifdef HAVE_BG_PIXMAP
1655		1711
1656	void	1712	void
1657	rxvt_term::update_background ()	1713	rxvt_term::update_background ()
1658	{	1714	{
1659	if (update_background_ev.is_active ())	1715	if (update_background_ev.is_active ())
1660	return;
1661
1662	bg_invalidate ();
1663
1664	if (!mapped)
1665	return;	1716	return;
1666		1717
1667	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1718	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668		1719
1669	if (to_wait <= 0.)	1720	if (to_wait <= 0.)

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.400 by sf-exg, Tue Jun 28 21:56:17 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.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC