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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC

…		…
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* 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	19	* 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	20	* the Free Software Foundation; either version 3 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
22	*	22	*
23	* This program is distributed in the hope that it will be useful,	23	* This program is distributed in the hope that it will be useful,
24	* but WITHOUT ANY WARRANTY; without even the implied warranty of	24	* but WITHOUT ANY WARRANTY; without even the implied warranty of
25	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	25	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
36	#include "keyboard.h"	36	#include "keyboard.h"
37	#include "rxvtperl.h"	37	#include "rxvtperl.h"
38		38
39	#include <limits>	39	#include <limits>
40		40
41	#include <cassert>	41	#include <assert.h>
42	#include <csignal>	42	#include <signal.h>
43	#include <cstring>	43	#include <string.h>
44		44
45	#include <termios.h>	45	#include <termios.h>
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	struct termios rxvt_term::def_tio;	54	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
58		56
…		…
170	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	168	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171	#endif	169	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	171	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174	#endif	172	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	175	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	177	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	179	#endif
182	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	182	#endif
…		…
228		226
229	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
230	bg_destroy ();	228	bg_destroy ();
231	#endif	229	#endif
232		230
		231	#if HAVE_IMG
		232	delete bg_img;
		233	#endif
		234
233	if (display)	235	if (display)
234	{	236	{
235	selection_clear ();	237	selection_clear ();
236	selection_clear (true);	238	selection_clear (true);
237		239
238	#ifdef USE_XIM	240	#if USE_XIM
239	im_destroy ();	241	im_destroy ();
240	#endif	242	#endif
241	scrollBar.destroy ();	243	scrollBar.destroy ();
		244
		245	if (gc)
242	if (gc) XFreeGC (dpy, gc);	246	XFreeGC (dpy, gc);
243		247
244	delete drawable;	248	delete drawable;
		249
245	// destroy all windows	250	// destroy all windows
246	if (parent)	251	if (parent)
247	XDestroyWindow (dpy, parent);	252	XDestroyWindow (dpy, parent);
248		253
249	for (int i = 0; i < TOTAL_COLORS; i++)	254	for (int i = 0; i < TOTAL_COLORS; i++)
…		…
267	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
268	free (allocated [i]);	273	free (allocated [i]);
269		274
270	free (selection.text);	275	free (selection.text);
271	free (selection.clip_text);	276	free (selection.clip_text);
272	// TODO: manage env vars in child only(!)
273	free (env_display);
274	free (env_term);
275	free (locale);	277	free (locale);
276	free (v_buffer);	278	free (v_buffer);
277		279
278	delete selection_req;	280	delete selection_req;
279		281
		282	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		283	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		284
		285	delete env;
		286
280	delete envv;	287	delete envv;
281	delete argv;	288	delete argv;
282		289
283	#ifdef KEYSYM_RESOURCE	290	#ifdef KEYSYM_RESOURCE
284	delete keyboard;	291	delete keyboard;
285	#endif	292	#endif
286	#ifndef NO_RESOURCES	293	#ifndef NO_RESOURCES
287	XrmDestroyDatabase (option_db);	294	XrmDestroyDatabase (option_db);
288	#endif	295	#endif
		296
		297	SET_R ((rxvt_term *)0);
289	}	298	}
290		299
291	// child has exited, usually destroys	300	// child has exited, usually destroys
292	void	301	void
293	rxvt_term::child_cb (ev::child &w, int status)	302	rxvt_term::child_cb (ev::child &w, int status)
…		…
316	{	325	{
317	#if USE_XIM	326	#if USE_XIM
318	im_ev.stop (display);	327	im_ev.stop (display);
319	#endif	328	#endif
320	scrollbar_ev.stop (display);	329	scrollbar_ev.stop (display);
321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	330	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
322	rootwin_ev.stop (display);	331	rootwin_ev.stop (display);
323	#endif	332	#endif
324	termwin_ev.stop (display);	333	termwin_ev.stop (display);
325	vt_ev.stop (display);	334	vt_ev.stop (display);
326	}	335	}
…		…
353		362
354	delete this;	363	delete this;
355	}	364	}
356		365
357	void	366	void
358	rxvt_term::set_option (uint8_t opt, bool set)	367	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359	{	368	{
360	if (!opt)	369	if (!opt)
361	return;	370	return;
362		371
363	uint8_t mask = 1 << (opt & 7);	372	uint8_t mask = 1 << (opt & 7);
…		…
367	}	376	}
368		377
369	/----------------------------------------------------------------------/	378	/----------------------------------------------------------------------/
370	/*	379	/*
371	* Exit gracefully, clearing the utmp entry and restoring tty attributes	380	* 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	*/	381	*/
374	static XErrorHandler old_xerror_handler;	382	static XErrorHandler old_xerror_handler;
375		383
376	static void	384	static void
377	rxvt_emergency_cleanup ()	385	rxvt_emergency_cleanup ()
…		…
379	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	387	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380	(*t)->emergency_cleanup ();	388	(*t)->emergency_cleanup ();
381	}	389	}
382		390
383	#if !ENABLE_MINIMAL	391	#if !ENABLE_MINIMAL
384	static void	392	static void ecb_cold
385	print_x_error (Display dpy, XErrorEvent event)	393	print_x_error (Display dpy, XErrorEvent event)
386	{	394	{
387	char buffer[BUFSIZ];	395	char buffer[BUFSIZ];
388	char mesg[BUFSIZ];	396	char mesg[BUFSIZ];
389	char number[32];	397	char number[32];
390	const char mtype[] = "XlibMessage";	398
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");	399	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		400
		401	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		402	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		403
		404	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		405	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394	rxvt_warn ("%s: %s\n", mesg, buffer);	406	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		407
395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	408	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	409	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		410
		411	if (event->request_code >= 128)
		412	{
		413	#if 0
		414	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		415	int nexts;
		416	char **exts = XListExtensions (dpy, &nexts);
		417
		418	while (nexts)
		419	{
		420	char *extname = exts [nexts - 1];
		421	int major, first_event, first_error;
		422
		423	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		424	{
		425	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		426	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		427
		428	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		429	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		430	rxvt_warn ("+ (which is %s)\n", buffer);
		431
		432	break;
		433	}
		434
		435	printf ("nextss %d %s\n", nexts, extname);//D
		436	--nexts;
		437	++exts;
		438	}
		439	#else
		440	int nexts = 0;
		441	char **exts = 0;
		442	#endif
		443
		444	if (!nexts)
		445	{
		446	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		447
		448	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		449	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		450
		451	#if 0
		452	sprintf (number, "RENDER.%d", event->minor_code);
		453	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		454	rxvt_warn ("+ (which is %s)\n", buffer);
		455	#endif
		456	}
		457
		458	XFreeExtensionList (exts);
		459	}
		460	else
		461	{
397	sprintf(number, "%d", event->request_code);	462	sprintf (number, "%d", event->request_code);
398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	463	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399	rxvt_warn ("(which is %s)\n", buffer);	464	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	}	465	}
		466
405	if ((event->error_code == BadWindow) \|\|	467	if (event->error_code == BadWindow
406	(event->error_code == BadPixmap) \|\|	468	\|\| event->error_code == BadPixmap
407	(event->error_code == BadCursor) \|\|	469	\|\| event->error_code == BadCursor
408	(event->error_code == BadFont) \|\|	470	\|\| event->error_code == BadFont
409	(event->error_code == BadDrawable) \|\|	471	\|\| event->error_code == BadDrawable
410	(event->error_code == BadColor) \|\|	472	\|\| event->error_code == BadColor
411	(event->error_code == BadGC) \|\|	473	\|\| event->error_code == BadGC
412	(event->error_code == BadIDChoice) \|\|	474	\|\| event->error_code == BadIDChoice
413	(event->error_code == BadValue) \|\|	475	\|\| event->error_code == BadValue
414	(event->error_code == BadAtom)) {	476	\|\| event->error_code == BadAtom)
		477	{
415	if (event->error_code == BadValue)	478	if (event->error_code == BadValue)
416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	479	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else if (event->error_code == BadAtom)	480	else if (event->error_code == BadAtom)
419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	481	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	else	482	else
422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	483	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		484
432	int	485	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		486	}
		487	}
		488	#endif
		489
		490	int ecb_cold
433	rxvt_xerror_handler (Display display, XErrorEvent event)	491	rxvt_xerror_handler (Display display, XErrorEvent event)
434	{	492	{
435	if (GET_R->allowedxerror == -1)	493	if (GET_R && GET_R->allowedxerror == -1)
436	GET_R->allowedxerror = event->error_code;	494	GET_R->allowedxerror = event->error_code;
437	else	495	else
438	{	496	{
439	// GET_R is most likely not the terminal which caused the error,	497	// GET_R is most likely not the terminal which caused the error,
440	// so just output the error and continue	498	// so just output the error and continue
…		…
446	}	504	}
447		505
448	return 0;	506	return 0;
449	}	507	}
450		508
451	int	509	int ecb_cold
452	rxvt_xioerror_handler (Display *display)	510	rxvt_xioerror_handler (Display *display)
453	{	511	{
454	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	512	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455	DisplayString (display));	513	DisplayString (display));
456	rxvt_emergency_cleanup ();	514	rxvt_emergency_cleanup ();
…		…
576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	634	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577	// TODO: handle this with exceptions and tolerate the memory loss	635	// TODO: handle this with exceptions and tolerate the memory loss
578	XSetIOErrorHandler (rxvt_xioerror_handler);	636	XSetIOErrorHandler (rxvt_xioerror_handler);
579		637
580	XrmInitialize ();	638	XrmInitialize ();
		639
		640	#if HAVE_PIXBUF
		641	g_type_init ();
		642	#endif
581	}	643	}
582		644
583	/----------------------------------------------------------------------/	645	/----------------------------------------------------------------------/
584	/*	646	/*
585	* window size/position calculations for XSizeHint and other storage.	647	* window size/position calculations for XSizeHint and other storage.
…		…
706	if (recalc_y)	768	if (recalc_y)
707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	769	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708		770
709	ncol = width / fwidth;	771	ncol = width / fwidth;
710	nrow = height / fheight;	772	nrow = height / fheight;
		773
		774	// When the size of the vt window is not a multiple of the cell
		775	// size, i.e., when the wm does not honour our size hints, there are
		776	// extra areas not covered by the terminal screen. Such gaps, when a
		777	// bg pixmap is set, would have to be cleared manually to properly
		778	// refresh the background. We take the simpler route and shrink the
		779	// vt window so as to avoid creating gaps.
		780	vt_width = ncol * fwidth;
		781	vt_height = nrow * fheight;
711	}	782	}
712		783
713	/----------------------------------------------------------------------/	784	/----------------------------------------------------------------------/
714	/*	785	/*
715	* Tell the teletype handler what size the window is.	786	* Tell the teletype handler what size the window is.
…		…
723		794
724	struct winsize ws;	795	struct winsize ws;
725		796
726	ws.ws_col = ncol;	797	ws.ws_col = ncol;
727	ws.ws_row = nrow;	798	ws.ws_row = nrow;
728	ws.ws_xpixel = width;	799	ws.ws_xpixel = vt_width;
729	ws.ws_ypixel = height;	800	ws.ws_ypixel = vt_height;
730	ioctl (pty->pty, TIOCSWINSZ, &ws);	801	ioctl (pty->pty, TIOCSWINSZ, &ws);
731		802
732	#if 0	803	#if 0
733	// TIOCSWINSZ is supposed to do this automatically and correctly	804	// TIOCSWINSZ is supposed to do this automatically and correctly
734	if (cmd_pid) /* force through to the command */	805	if (cmd_pid) /* force through to the command */
…		…
760		831
761	delete fontset[0];	832	delete fontset[0];
762	fontset[0] = fs;	833	fontset[0] = fs;
763		834
764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	835	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765	prop.height += lineSpace;	836	prop.width = max (prop.width + letterSpace, 1);
766	prop.width += letterSpace;
767		837
768	fs->set_prop (prop, false);	838	fs->set_prop (prop, false);
769		839
770	fwidth = prop.width;	840	fwidth = prop.width;
771	fheight = prop.height;	841	fheight = prop.height + lineSpace;
772	fbase = prop.ascent;	842	fbase = prop.ascent;
773		843
774	for (int style = 1; style < 4; style++)	844	for (int style = 1; style < 4; style++)
775	{	845	{
776	#if ENABLE_STYLES	846	#if ENABLE_STYLES
…		…
938		1008
939	/----------------------------------------------------------------------/	1009	/----------------------------------------------------------------------/
940	/*	1010	/*
941	* find if fg/bg matches any of the normal (low-intensity) colors	1011	* find if fg/bg matches any of the normal (low-intensity) colors
942	*/	1012	*/
943	void	1013	char *
944	rxvt_term::set_colorfgbg ()	1014	rxvt_term::get_colorfgbg ()
945	{	1015	{
946	unsigned int i;	1016	unsigned int i;
947	const char *xpmb = "";	1017	const char *xpmb = "";
948	char fstr[] = "default";	1018	char fstr[] = "default";
949	char bstr[] = "default";	1019	char bstr[] = "default";
		1020	char *env_colorfgbg;
950		1021
951	for (i = Color_Black; i <= Color_White; i++)	1022	for (i = Color_Black; i <= Color_White; i++)
952	if (pix_colors[Color_fg] == pix_colors[i])	1023	if (pix_colors[Color_fg] == pix_colors[i])
953	{	1024	{
954	sprintf (fstr, "%d", i - Color_Black);	1025	sprintf (fstr, "%d", i - Color_Black);
…		…
957		1028
958	for (i = Color_Black; i <= Color_White; i++)	1029	for (i = Color_Black; i <= Color_White; i++)
959	if (pix_colors[Color_bg] == pix_colors[i])	1030	if (pix_colors[Color_bg] == pix_colors[i])
960	{	1031	{
961	sprintf (bstr, "%d", i - Color_Black);	1032	sprintf (bstr, "%d", i - Color_Black);
962	#ifdef BG_IMAGE_FROM_FILE	1033	#if BG_IMAGE_FROM_FILE
963	xpmb = "default;";	1034	xpmb = "default;";
964	#endif	1035	#endif
965	break;	1036	break;
966	}	1037	}
967		1038
		1039	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
968	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1040	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		1041	return env_colorfgbg;
969	}	1042	}
970		1043
971	/----------------------------------------------------------------------/	1044	/----------------------------------------------------------------------/
972		1045
973	bool	1046	bool
…		…
1066	if (scrollBar.state)	1139	if (scrollBar.state)
1067	scrollBar.resize ();	1140	scrollBar.resize ();
1068		1141
1069	XMoveResizeWindow (dpy, vt,	1142	XMoveResizeWindow (dpy, vt,
1070	window_vt_x, window_vt_y,	1143	window_vt_x, window_vt_y,
1071	width, height);	1144	vt_width, vt_height);
		1145
		1146	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1072		1147
1073	#ifdef HAVE_BG_PIXMAP	1148	#ifdef HAVE_BG_PIXMAP
1074	if (bg_window_size_sensitive ())	1149	if (bg_window_size_sensitive ())
1075	update_background ();	1150	update_background ();
1076	#endif	1151	#endif
1077	}	1152	}
1078		1153
1079	if (fix_screen \|\| old_height == 0)	1154	if (fix_screen \|\| old_height == 0)
1080	scr_reset ();	1155	scr_reset ();
1081		1156
1082	#ifdef USE_XIM	1157	#if USE_XIM
1083	im_set_position ();	1158	im_set_position ();
1084	#endif	1159	#endif
1085	}	1160	}
1086		1161
1087	/*	1162	/*
…		…
1101	newwidth = wattr.width - szHint.base_width;	1176	newwidth = wattr.width - szHint.base_width;
1102	if (newheight == 0)	1177	if (newheight == 0)
1103	newheight = wattr.height - szHint.base_height;	1178	newheight = wattr.height - szHint.base_height;
1104	}	1179	}
1105		1180
1106	if (newwidth != width \|\| newheight != height)	1181	if (newwidth != vt_width \|\| newheight != vt_height)
1107	{	1182	{
1108	newwidth += szHint.base_width;	1183	newwidth += szHint.base_width;
1109	newheight += szHint.base_height;	1184	newheight += szHint.base_height;
1110	resize_all_windows (newwidth, newheight, 0);	1185	resize_all_windows (newwidth, newheight, 0);
1111	}	1186	}
1112	}	1187	}
1113		1188
1114	/* -------------------------------------------------------------------- *	1189	/* -------------------------------------------------------------------- *
1115	* - X INPUT METHOD ROUTINES - *	1190	* - X INPUT METHOD ROUTINES - *
1116	* -------------------------------------------------------------------- */	1191	* -------------------------------------------------------------------- */
1117	#ifdef USE_XIM	1192	#if USE_XIM
1118		1193
1119	void	1194	void
1120	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1195	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1121	{	1196	{
1122	fg = pix_colors [Color_fg];	1197	fg = pix_colors [Color_fg];
…		…
1302	unsigned long fg, bg;	1377	unsigned long fg, bg;
1303	const char *p;	1378	const char *p;
1304	char **s;	1379	char **s;
1305	XIMStyles *xim_styles;	1380	XIMStyles *xim_styles;
1306		1381
1307	set_environ (envv);	1382	set_environ (env);
1308		1383
1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1384	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1310	return false;	1385	return false;
1311		1386
1312	input_method = display->get_xim (locale, modifiers);	1387	input_method = display->get_xim (locale, modifiers);
1313	if (input_method == NULL)	1388	if (input_method == NULL)
1314	return false;	1389	return false;
…		…
1519	im_destroy ();	1594	im_destroy ();
1520		1595
1521	if (Input_Context)	1596	if (Input_Context)
1522	return;	1597	return;
1523		1598
1524	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1525	if (rs[Rs_imLocale])	1599	if (rs[Rs_imLocale])
1526	SET_LOCALE (rs[Rs_imLocale]);	1600	SET_LOCALE (rs[Rs_imLocale]);
1527	#endif
1528		1601
1529	p = rs[Rs_inputMethod];	1602	p = rs[Rs_inputMethod];
1530	if (p && *p)	1603	if (p && *p)
1531	{	1604	{
1532	bool found = false;	1605	bool found = false;
…		…
1560	/* try with no modifiers base IF the user didn't specify an IM */	1633	/* try with no modifiers base IF the user didn't specify an IM */
1561	if (im_get_ic ("@im=none"))	1634	if (im_get_ic ("@im=none"))
1562	goto done;	1635	goto done;
1563		1636
1564	done:	1637	done:
1565	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1566	if (rs[Rs_imLocale])	1638	if (rs[Rs_imLocale])
1567	SET_LOCALE (locale);	1639	SET_LOCALE (locale);
1568	#endif
1569	}	1640	}
1570		1641
1571	void	1642	void
1572	rxvt_term::im_set_position ()	1643	rxvt_term::im_set_position ()
1573	{	1644	{
…		…
1618	{	1689	{
1619	Window cr;	1690	Window cr;
1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1691	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1621	}	1692	}
1622		1693
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	1694	#ifdef HAVE_BG_PIXMAP
1646		1695
1647	void	1696	void
1648	rxvt_term::update_background ()	1697	rxvt_term::update_background ()
1649	{	1698	{
1650	if (update_background_ev.is_active ())	1699	if (update_background_ev.is_active ())
1651	return;	1700	return;
1652
1653	bg_invalidate ();
1654		1701
1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1702	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1656		1703
1657	if (to_wait <= 0.)	1704	if (to_wait <= 0.)
1658	bg_render ();	1705	bg_render ();

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs. Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC