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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC vs.
Revision 1.397 by root, Sat Dec 13 12:24:32 2014 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
…		…
168	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);
169	#endif	169	#endif
170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171	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);
172	#endif	172	#endif
173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175	#endif	175	#endif
176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177	#if USE_XIM	177	#if USE_XIM
178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
…		…
226		226
227	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
228	bg_destroy ();	228	bg_destroy ();
229	#endif	229	#endif
230		230
		231	#if HAVE_IMG
		232	delete bg_img;
		233	#endif
		234
231	if (display)	235	if (display)
232	{	236	{
233	selection_clear ();	237	selection_clear ();
234	selection_clear (true);	238	selection_clear (true);
235		239
236	#if USE_XIM	240	#if USE_XIM
237	im_destroy ();	241	im_destroy ();
238	#endif	242	#endif
239	scrollBar.destroy ();	243	scrollBar.destroy ();
		244
		245	if (gc)
240	if (gc) XFreeGC (dpy, gc);	246	XFreeGC (dpy, gc);
241		247
242	delete drawable;	248	delete drawable;
		249
243	// destroy all windows	250	// destroy all windows
244	if (parent)	251	if (parent)
245	XDestroyWindow (dpy, parent);	252	XDestroyWindow (dpy, parent);
246		253
247	for (int i = 0; i < TOTAL_COLORS; i++)	254	for (int i = 0; i < TOTAL_COLORS; i++)
248	if (ISSET_PIXCOLOR (i))	255	if (ISSET_PIXCOLOR (i))
249	{	256	{
250	pix_colors_focused [i].free (this);	257	pix_colors_focused [i].free (this);
251	#if OFF_FOCUS_FADING	258	#if OFF_FOCUS_FADING
		259	if (rs[Rs_fade])
252	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
253	#endif	261	#endif
254	}	262	}
255		263
256	clear ();	264	clear ();
257		265
…		…
270	free (locale);	278	free (locale);
271	free (v_buffer);	279	free (v_buffer);
272		280
273	delete selection_req;	281	delete selection_req;
274		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
275	delete envv;	288	delete envv;
276	delete argv;	289	delete argv;
277		290
278	#ifdef KEYSYM_RESOURCE	291	#ifdef KEYSYM_RESOURCE
279	delete keyboard;	292	delete keyboard;
280	#endif	293	#endif
281	#ifndef NO_RESOURCES	294	#ifndef NO_RESOURCES
282	XrmDestroyDatabase (option_db);	295	XrmDestroyDatabase (option_db);
283	#endif	296	#endif
		297
		298	SET_R ((rxvt_term *)0);
284	}	299	}
285		300
286	// child has exited, usually destroys	301	// child has exited, usually destroys
287	void	302	void
288	rxvt_term::child_cb (ev::child &w, int status)	303	rxvt_term::child_cb (ev::child &w, int status)
…		…
311	{	326	{
312	#if USE_XIM	327	#if USE_XIM
313	im_ev.stop (display);	328	im_ev.stop (display);
314	#endif	329	#endif
315	scrollbar_ev.stop (display);	330	scrollbar_ev.stop (display);
316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	331	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
317	rootwin_ev.stop (display);	332	rootwin_ev.stop (display);
318	#endif	333	#endif
319	termwin_ev.stop (display);	334	termwin_ev.stop (display);
320	vt_ev.stop (display);	335	vt_ev.stop (display);
321	}	336	}
…		…
362	}	377	}
363		378
364	/----------------------------------------------------------------------/	379	/----------------------------------------------------------------------/
365	/*	380	/*
366	* Exit gracefully, clearing the utmp entry and restoring tty attributes	381	* Exit gracefully, clearing the utmp entry and restoring tty attributes
367	* TODO: if debugging, this should free up any known resources if we can
368	*/	382	*/
369	static XErrorHandler old_xerror_handler;	383	static XErrorHandler old_xerror_handler;
370		384
371	static void	385	static void
372	rxvt_emergency_cleanup ()	386	rxvt_emergency_cleanup ()
…		…
377		391
378	#if !ENABLE_MINIMAL	392	#if !ENABLE_MINIMAL
379	static void ecb_cold	393	static void ecb_cold
380	print_x_error (Display dpy, XErrorEvent event)	394	print_x_error (Display dpy, XErrorEvent event)
381	{	395	{
382	char buffer[BUFSIZ];	396	char buffer[BUFSIZ];
383	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
384	char number[32];	398	char number[32];
385	const char mtype[] = "XlibMessage";
386		399
387	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
388	XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
389	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);
390	rxvt_warn ("%s: %s\n", mesg, buffer);	407	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		408
391	XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	409	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
392	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	{
393	sprintf (number, "%d", event->request_code);	463	sprintf (number, "%d", event->request_code);
394	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);	464	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
395	rxvt_warn ("(which is %s)\n", buffer);	465	rxvt_warn ("+ (which is %s)\n", buffer);
396
397	if (event->request_code >= 128)
398	{
399	XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401	}	466	}
402		467
403	if (event->error_code == BadWindow	468	if (event->error_code == BadWindow
404	\|\| event->error_code == BadPixmap	469	\|\| event->error_code == BadPixmap
405	\|\| event->error_code == BadCursor	470	\|\| event->error_code == BadCursor
406	\|\| event->error_code == BadFont	471	\|\| event->error_code == BadFont
407	\|\| event->error_code == BadDrawable	472	\|\| event->error_code == BadDrawable
408	\|\| event->error_code == BadColor	473	\|\| event->error_code == BadColor
409	\|\| event->error_code == BadGC	474	\|\| event->error_code == BadGC
410	\|\| event->error_code == BadIDChoice	475	\|\| event->error_code == BadIDChoice
411	\|\| event->error_code == BadValue	476	\|\| event->error_code == BadValue
412	\|\| event->error_code == BadAtom)	477	\|\| event->error_code == BadAtom)
413	{	478	{
414	if (event->error_code == BadValue)	479	if (event->error_code == BadValue)
415	XGetErrorDatabaseText (dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);	480	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
416	else if (event->error_code == BadAtom)	481	else if (event->error_code == BadAtom)
417	XGetErrorDatabaseText (dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);	482	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
418	else	483	else
419	XGetErrorDatabaseText (dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);	484	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420		485
421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	486	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
422	}	487	}
423
424	XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426	}	488	}
427	#endif	489	#endif
428		490
429	int ecb_cold	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
…		…
770		832
771	delete fontset[0];	833	delete fontset[0];
772	fontset[0] = fs;	834	fontset[0] = fs;
773		835
774	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	836	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
775	prop.width += letterSpace;	837	prop.width = max (prop.width + letterSpace, 1);
776		838
777	fs->set_prop (prop, false);	839	fs->set_prop (prop, false);
778		840
779	fwidth = prop.width;	841	fwidth = prop.width;
780	fheight = prop.height + lineSpace;	842	fheight = prop.height + lineSpace;
…		…
880		942
881	void	943	void
882	rxvt_term::set_window_color (int idx, const char *color)	944	rxvt_term::set_window_color (int idx, const char *color)
883	{	945	{
884	#ifdef XTERM_COLOR_CHANGE	946	#ifdef XTERM_COLOR_CHANGE
885	rxvt_color xcol;
886
887	if (color == NULL \|\| *color == '\0')	947	if (color == NULL \|\| *color == '\0')
888	return;	948	return;
889		949
890	color = strdup (color);	950	color = strdup (color);
891	allocated.push_back ((void *)color);	951	allocated.push_back ((void *)color);
…		…
897	int i = atoi (color);	957	int i = atoi (color);
898		958
899	if (i >= 8 && i <= 15)	959	if (i >= 8 && i <= 15)
900	{	960	{
901	/* bright colors */	961	/* bright colors */
902	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	962	alias_color (idx, minBrightCOLOR + i - 8);
903	goto done;	963	goto done;
904	}	964	}
905		965
906	if (i >= 0 && i <= 7)	966	if (i >= 0 && i <= 7)
907	{	967	{
908	/* normal colors */	968	/* normal colors */
909	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	969	alias_color (idx, minCOLOR + i);
910	goto done;	970	goto done;
911	}	971	}
912	}	972	}
913		973
914	set_color (xcol, color);	974	pix_colors_focused[idx].free (this);
915		975	set_color (pix_colors_focused[idx], color);
916	/*
917	* FIXME: should free colors here, but no idea how to do it so instead,
918	* so just keep gobbling up the colormap
919	*/
920
921	pix_colors_focused[idx] = xcol;
922		976
923	done:	977	done:
924	/TODO: handle Color_BD, scrollbar background, etc. /	978	/TODO: handle Color_BD, scrollbar background, etc. /
925		979
926	update_fade_color (idx);	980	update_fade_color (idx);
927	recolour_cursor ();	981	recolor_cursor ();
928	scr_recolour ();	982	scr_recolor ();
929	#endif /* XTERM_COLOR_CHANGE */	983	#endif /* XTERM_COLOR_CHANGE */
930	}	984	}
931		985
932	void	986	void
933	rxvt_term::recolour_cursor ()	987	rxvt_term::recolor_cursor ()
934	{	988	{
935	XColor fg, bg;	989	XColor fg, bg;
936		990
937	(ISSET_PIXCOLOR (Color_pointer_fg)	991	(ISSET_PIXCOLOR (Color_pointer_fg)
938	? pix_colors_focused[Color_pointer_fg]	992	? pix_colors_focused[Color_pointer_fg]
…		…
993	}	1047	}
994		1048
995	void	1049	void
996	rxvt_term::alias_color (int dst, int src)	1050	rxvt_term::alias_color (int dst, int src)
997	{	1051	{
		1052	pix_colors[dst].free (this);
998	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]);
999	}	1054	}
1000		1055
1001	/* -------------------------------------------------------------------- *	1056	/* -------------------------------------------------------------------- *
1002	* - WINDOW RESIZING - *	1057	* - WINDOW RESIZING - *
…		…
1316	unsigned long fg, bg;	1371	unsigned long fg, bg;
1317	const char *p;	1372	const char *p;
1318	char **s;	1373	char **s;
1319	XIMStyles *xim_styles;	1374	XIMStyles *xim_styles;
1320		1375
1321	set_environ (envv);	1376	set_environ (env);
1322		1377
1323	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1378	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1324	return false;	1379	return false;
1325		1380
1326	input_method = display->get_xim (locale, modifiers);	1381	input_method = display->get_xim (locale, modifiers);
1327	if (input_method == NULL)	1382	if (input_method == NULL)
1328	return false;	1383	return false;
…		…
1636	rxvt_term::update_background ()	1691	rxvt_term::update_background ()
1637	{	1692	{
1638	if (update_background_ev.is_active ())	1693	if (update_background_ev.is_active ())
1639	return;	1694	return;
1640		1695
1641	bg_invalidate ();
1642
1643	if (!mapped)
1644	return;
1645
1646	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1696	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1647		1697
1648	if (to_wait <= 0.)	1698	if (to_wait <= 0.)
1649	bg_render ();	1699	bg_render ();
1650	else	1700	else

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC vs. Revision 1.397 by root, Sat Dec 13 12:24:32 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC vs.
Revision 1.397 by root, Sat Dec 13 12:24:32 2014 UTC