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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 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	*	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++)
250	if (ISSET_PIXCOLOR (i))	255	if (ISSET_PIXCOLOR (i))
251	{	256	{
252	pix_colors_focused [i].free (this);	257	pix_colors_focused [i].free (this);
253	#if OFF_FOCUS_FADING	258	#if OFF_FOCUS_FADING
		259	if (rs[Rs_fade])
254	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
255	#endif	261	#endif
256	}	262	}
257		263
258	clear ();	264	clear ();
259		265
…		…
272	free (locale);	278	free (locale);
273	free (v_buffer);	279	free (v_buffer);
274		280
275	delete selection_req;	281	delete selection_req;
276		282
		283	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		284	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		285
		286	delete [] env;
		287
277	delete envv;	288	delete envv;
278	delete argv;	289	delete argv;
279		290
280	#ifdef KEYSYM_RESOURCE	291	#ifdef KEYSYM_RESOURCE
281	delete keyboard;	292	delete keyboard;
282	#endif	293	#endif
283	#ifndef NO_RESOURCES	294	#ifndef NO_RESOURCES
284	XrmDestroyDatabase (option_db);	295	XrmDestroyDatabase (option_db);
285	#endif	296	#endif
		297
		298	SET_R ((rxvt_term *)0);
286	}	299	}
287		300
288	// child has exited, usually destroys	301	// child has exited, usually destroys
289	void	302	void
290	rxvt_term::child_cb (ev::child &w, int status)	303	rxvt_term::child_cb (ev::child &w, int status)
…		…
313	{	326	{
314	#if USE_XIM	327	#if USE_XIM
315	im_ev.stop (display);	328	im_ev.stop (display);
316	#endif	329	#endif
317	scrollbar_ev.stop (display);	330	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	331	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	332	rootwin_ev.stop (display);
320	#endif	333	#endif
321	termwin_ev.stop (display);	334	termwin_ev.stop (display);
322	vt_ev.stop (display);	335	vt_ev.stop (display);
323	}	336	}
…		…
350		363
351	delete this;	364	delete this;
352	}	365	}
353		366
354	void	367	void
355	rxvt_term::set_option (uint8_t opt, bool set)	368	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356	{	369	{
357	if (!opt)	370	if (!opt)
358	return;	371	return;
359		372
360	uint8_t mask = 1 << (opt & 7);	373	uint8_t mask = 1 << (opt & 7);
…		…
364	}	377	}
365		378
366	/----------------------------------------------------------------------/	379	/----------------------------------------------------------------------/
367	/*	380	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	381	* 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	*/	382	*/
371	static XErrorHandler old_xerror_handler;	383	static XErrorHandler old_xerror_handler;
372		384
373	static void	385	static void
374	rxvt_emergency_cleanup ()	386	rxvt_emergency_cleanup ()
…		…
376	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	388	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377	(*t)->emergency_cleanup ();	389	(*t)->emergency_cleanup ();
378	}	390	}
379		391
380	#if !ENABLE_MINIMAL	392	#if !ENABLE_MINIMAL
381	static void	393	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	394	print_x_error (Display dpy, XErrorEvent event)
383	{	395	{
384	char buffer[BUFSIZ];	396	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
386	char number[32];	398	char number[32];
387	const char mtype[] = "XlibMessage";	399
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");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		401
		402	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		403	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		404
		405	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		406	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	407	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		408
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	409	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	410	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		411
		412	if (event->request_code >= 128)
		413	{
		414	#if 0
		415	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		416	int nexts;
		417	char **exts = XListExtensions (dpy, &nexts);
		418
		419	while (nexts)
		420	{
		421	char *extname = exts [nexts - 1];
		422	int major, first_event, first_error;
		423
		424	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		425	{
		426	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		427	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		428
		429	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		430	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		431	rxvt_warn ("+ (which is %s)\n", buffer);
		432
		433	break;
		434	}
		435
		436	printf ("nextss %d %s\n", nexts, extname);//D
		437	--nexts;
		438	++exts;
		439	}
		440	#else
		441	int nexts = 0;
		442	char **exts = 0;
		443	#endif
		444
		445	if (!nexts)
		446	{
		447	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		448
		449	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		450	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		451
		452	#if 0
		453	sprintf (number, "RENDER.%d", event->minor_code);
		454	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		455	rxvt_warn ("+ (which is %s)\n", buffer);
		456	#endif
		457	}
		458
		459	XFreeExtensionList (exts);
		460	}
		461	else
		462	{
394	sprintf(number, "%d", event->request_code);	463	sprintf (number, "%d", event->request_code);
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	464	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);	465	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	}	466	}
		467
402	if ((event->error_code == BadWindow) \|\|	468	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	469	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	470	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	471	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	472	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	473	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	474	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	475	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	476	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	477	\|\| event->error_code == BadAtom)
		478	{
412	if (event->error_code == BadValue)	479	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	480	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	481	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	482	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	483	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	484	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		485
429	int	486	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		487	}
		488	}
		489	#endif
		490
		491	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	492	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	493	{
432	if (GET_R->allowedxerror == -1)	494	if (GET_R && GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	495	GET_R->allowedxerror = event->error_code;
434	else	496	else
435	{	497	{
436	// GET_R is most likely not the terminal which caused the error,	498	// GET_R is most likely not the terminal which caused the error,
437	// so just output the error and continue	499	// so just output the error and continue
…		…
443	}	505	}
444		506
445	return 0;	507	return 0;
446	}	508	}
447		509
448	int	510	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	511	rxvt_xioerror_handler (Display *display)
450	{	512	{
451	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	513	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452	DisplayString (display));	514	DisplayString (display));
453	rxvt_emergency_cleanup ();	515	rxvt_emergency_cleanup ();
…		…
573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574	// TODO: handle this with exceptions and tolerate the memory loss	636	// TODO: handle this with exceptions and tolerate the memory loss
575	XSetIOErrorHandler (rxvt_xioerror_handler);	637	XSetIOErrorHandler (rxvt_xioerror_handler);
576		638
577	XrmInitialize ();	639	XrmInitialize ();
		640
		641	#if HAVE_PIXBUF
		642	g_type_init ();
		643	#endif
578	}	644	}
579		645
580	/----------------------------------------------------------------------/	646	/----------------------------------------------------------------------/
581	/*	647	/*
582	* window size/position calculations for XSizeHint and other storage.	648	* window size/position calculations for XSizeHint and other storage.
…		…
766		832
767	delete fontset[0];	833	delete fontset[0];
768	fontset[0] = fs;	834	fontset[0] = fs;
769		835
770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	836	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771	prop.height += lineSpace;	837	prop.width = max (prop.width + letterSpace, 1);
772	prop.width += letterSpace;
773		838
774	fs->set_prop (prop, false);	839	fs->set_prop (prop, false);
775		840
776	fwidth = prop.width;	841	fwidth = prop.width;
777	fheight = prop.height;	842	fheight = prop.height + lineSpace;
778	fbase = prop.ascent;	843	fbase = prop.ascent;
779		844
780	for (int style = 1; style < 4; style++)	845	for (int style = 1; style < 4; style++)
781	{	846	{
782	#if ENABLE_STYLES	847	#if ENABLE_STYLES
…		…
877		942
878	void	943	void
879	rxvt_term::set_window_color (int idx, const char *color)	944	rxvt_term::set_window_color (int idx, const char *color)
880	{	945	{
881	#ifdef XTERM_COLOR_CHANGE	946	#ifdef XTERM_COLOR_CHANGE
882	rxvt_color xcol;
883
884	if (color == NULL \|\| *color == '\0')	947	if (color == NULL \|\| *color == '\0')
885	return;	948	return;
886		949
887	color = strdup (color);	950	color = strdup (color);
888	allocated.push_back ((void *)color);	951	allocated.push_back ((void *)color);
…		…
894	int i = atoi (color);	957	int i = atoi (color);
895		958
896	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
897	{	960	{
898	/* bright colors */	961	/* bright colors */
899	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	962	alias_color (idx, minBrightCOLOR + i - 8);
900	goto done;	963	goto done;
901	}	964	}
902		965
903	if (i >= 0 && i <= 7)	966	if (i >= 0 && i <= 7)
904	{	967	{
905	/* normal colors */	968	/* normal colors */
906	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	969	alias_color (idx, minCOLOR + i);
907	goto done;	970	goto done;
908	}	971	}
909	}	972	}
910		973
911	set_color (xcol, color);	974	pix_colors_focused[idx].free (this);
912		975	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		976
920	done:	977	done:
921	/TODO: handle Color_BD, scrollbar background, etc. /	978	/TODO: handle Color_BD, scrollbar background, etc. /
922		979
923	update_fade_color (idx);	980	update_fade_color (idx);
924	recolour_cursor ();	981	recolor_cursor ();
925	scr_recolour ();	982	scr_recolor ();
926	#endif /* XTERM_COLOR_CHANGE */	983	#endif /* XTERM_COLOR_CHANGE */
927	}	984	}
928		985
929	void	986	void
930	rxvt_term::recolour_cursor ()	987	rxvt_term::recolor_cursor ()
931	{	988	{
932	XColor fg, bg;	989	XColor fg, bg;
933		990
934	(ISSET_PIXCOLOR (Color_pointer_fg)	991	(ISSET_PIXCOLOR (Color_pointer_fg)
935	? pix_colors_focused[Color_pointer_fg]	992	? pix_colors_focused[Color_pointer_fg]
…		…
964		1021
965	for (i = Color_Black; i <= Color_White; i++)	1022	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_bg] == pix_colors[i])	1023	if (pix_colors[Color_bg] == pix_colors[i])
967	{	1024	{
968	sprintf (bstr, "%d", i - Color_Black);	1025	sprintf (bstr, "%d", i - Color_Black);
969	#ifdef BG_IMAGE_FROM_FILE	1026	#if BG_IMAGE_FROM_FILE
970	xpmb = "default;";	1027	xpmb = "default;";
971	#endif	1028	#endif
972	break;	1029	break;
973	}	1030	}
974		1031
…		…
990	}	1047	}
991		1048
992	void	1049	void
993	rxvt_term::alias_color (int dst, int src)	1050	rxvt_term::alias_color (int dst, int src)
994	{	1051	{
		1052	pix_colors[dst].free (this);
995	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);	1053	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
996	}	1054	}
997		1055
998	/* -------------------------------------------------------------------- *	1056	/* -------------------------------------------------------------------- *
999	* - WINDOW RESIZING - *	1057	* - WINDOW RESIZING - *
…		…
1077		1135
1078	XMoveResizeWindow (dpy, vt,	1136	XMoveResizeWindow (dpy, vt,
1079	window_vt_x, window_vt_y,	1137	window_vt_x, window_vt_y,
1080	vt_width, vt_height);	1138	vt_width, vt_height);
1081		1139
		1140	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1141
1082	#ifdef HAVE_BG_PIXMAP	1142	#ifdef HAVE_BG_PIXMAP
1083	if (bg_window_size_sensitive ())	1143	if (bg_window_size_sensitive ())
1084	update_background ();	1144	update_background ();
1085	#endif	1145	#endif
1086	}	1146	}
1087		1147
1088	if (fix_screen \|\| old_height == 0)	1148	if (fix_screen \|\| old_height == 0)
1089	scr_reset ();	1149	scr_reset ();
1090		1150
1091	#ifdef USE_XIM	1151	#if USE_XIM
1092	im_set_position ();	1152	im_set_position ();
1093	#endif	1153	#endif
1094	}	1154	}
1095		1155
1096	/*	1156	/*
…		…
1121	}	1181	}
1122		1182
1123	/* -------------------------------------------------------------------- *	1183	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1184	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1185	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1186	#if USE_XIM
1127		1187
1128	void	1188	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1189	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1190	{
1131	fg = pix_colors [Color_fg];	1191	fg = pix_colors [Color_fg];
…		…
1311	unsigned long fg, bg;	1371	unsigned long fg, bg;
1312	const char *p;	1372	const char *p;
1313	char **s;	1373	char **s;
1314	XIMStyles *xim_styles;	1374	XIMStyles *xim_styles;
1315		1375
1316	set_environ (envv);	1376	set_environ (env);
1317		1377
1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1378	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319	return false;	1379	return false;
1320		1380
1321	input_method = display->get_xim (locale, modifiers);	1381	input_method = display->get_xim (locale, modifiers);
1322	if (input_method == NULL)	1382	if (input_method == NULL)
1323	return false;	1383	return false;
…		…
1528	im_destroy ();	1588	im_destroy ();
1529		1589
1530	if (Input_Context)	1590	if (Input_Context)
1531	return;	1591	return;
1532		1592
1533	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1534	if (rs[Rs_imLocale])	1593	if (rs[Rs_imLocale])
1535	SET_LOCALE (rs[Rs_imLocale]);	1594	SET_LOCALE (rs[Rs_imLocale]);
1536	#endif
1537		1595
1538	p = rs[Rs_inputMethod];	1596	p = rs[Rs_inputMethod];
1539	if (p && *p)	1597	if (p && *p)
1540	{	1598	{
1541	bool found = false;	1599	bool found = false;
…		…
1568		1626
1569	/* try with no modifiers base IF the user didn't specify an IM */	1627	/* try with no modifiers base IF the user didn't specify an IM */
1570	if (im_get_ic ("@im=none"))	1628	if (im_get_ic ("@im=none"))
1571	goto done;	1629	goto done;
1572		1630
1573	done: ;	1631	done:
1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1575	if (rs[Rs_imLocale])	1632	if (rs[Rs_imLocale])
1576	SET_LOCALE (locale);	1633	SET_LOCALE (locale);
1577	#endif
1578	}	1634	}
1579		1635
1580	void	1636	void
1581	rxvt_term::im_set_position ()	1637	rxvt_term::im_set_position ()
1582	{	1638	{
…		…
1627	{	1683	{
1628	Window cr;	1684	Window cr;
1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1685	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630	}	1686	}
1631		1687
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	1688	#ifdef HAVE_BG_PIXMAP
1655		1689
1656	void	1690	void
1657	rxvt_term::update_background ()	1691	rxvt_term::update_background ()
1658	{	1692	{
1659	if (update_background_ev.is_active ())	1693	if (update_background_ev.is_active ())
1660	return;
1661
1662	bg_invalidate ();
1663
1664	if (!mapped)
1665	return;	1694	return;
1666		1695
1667	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1696	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668		1697
1669	if (to_wait <= 0.)	1698	if (to_wait <= 0.)

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs. Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 UTC