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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.382 by root, Tue Jun 5 12:04:55 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
…		…
168	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);
169	#endif	170	#endif
170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171	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);
172	#endif	173	#endif
173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175	#endif	176	#endif
176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177	#if USE_XIM	178	#if USE_XIM
178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
…		…
226		227
227	#ifdef HAVE_BG_PIXMAP	228	#ifdef HAVE_BG_PIXMAP
228	bg_destroy ();	229	bg_destroy ();
229	#endif	230	#endif
230		231
		232	#if HAVE_IMG
		233	delete bg_img;
		234	#endif
		235
231	if (display)	236	if (display)
232	{	237	{
233	selection_clear ();	238	selection_clear ();
234	selection_clear (true);	239	selection_clear (true);
235		240
236	#if USE_XIM	241	#if USE_XIM
237	im_destroy ();	242	im_destroy ();
238	#endif	243	#endif
239	scrollBar.destroy ();	244	scrollBar.destroy ();
		245
		246	if (gc)
240	if (gc) XFreeGC (dpy, gc);	247	XFreeGC (dpy, gc);
241		248
242	delete drawable;	249	delete drawable;
		250
243	// destroy all windows	251	// destroy all windows
244	if (parent)	252	if (parent)
245	XDestroyWindow (dpy, parent);	253	XDestroyWindow (dpy, parent);
246		254
247	for (int i = 0; i < TOTAL_COLORS; i++)	255	for (int i = 0; i < TOTAL_COLORS; i++)
248	if (ISSET_PIXCOLOR (i))	256	if (ISSET_PIXCOLOR (i))
249	{	257	{
250	pix_colors_focused [i].free (this);	258	pix_colors_focused [i].free (this);
251	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
		260	if (rs[Rs_fade])
252	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
253	#endif	262	#endif
254	}	263	}
255		264
256	clear ();	265	clear ();
257		266
…		…
270	free (locale);	279	free (locale);
271	free (v_buffer);	280	free (v_buffer);
272		281
273	delete selection_req;	282	delete selection_req;
274		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
275	delete envv;	289	delete envv;
276	delete argv;	290	delete argv;
277		291
278	#ifdef KEYSYM_RESOURCE	292	#ifdef KEYSYM_RESOURCE
279	delete keyboard;	293	delete keyboard;
280	#endif	294	#endif
281	#ifndef NO_RESOURCES	295	#ifndef NO_RESOURCES
282	XrmDestroyDatabase (option_db);	296	XrmDestroyDatabase (option_db);
283	#endif	297	#endif
		298
		299	SET_R ((rxvt_term *)0);
284	}	300	}
285		301
286	// child has exited, usually destroys	302	// child has exited, usually destroys
287	void	303	void
288	rxvt_term::child_cb (ev::child &w, int status)	304	rxvt_term::child_cb (ev::child &w, int status)
…		…
311	{	327	{
312	#if USE_XIM	328	#if USE_XIM
313	im_ev.stop (display);	329	im_ev.stop (display);
314	#endif	330	#endif
315	scrollbar_ev.stop (display);	331	scrollbar_ev.stop (display);
316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	332	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
317	rootwin_ev.stop (display);	333	rootwin_ev.stop (display);
318	#endif	334	#endif
319	termwin_ev.stop (display);	335	termwin_ev.stop (display);
320	vt_ev.stop (display);	336	vt_ev.stop (display);
321	}	337	}
…		…
376		392
377	#if !ENABLE_MINIMAL	393	#if !ENABLE_MINIMAL
378	static void ecb_cold	394	static void ecb_cold
379	print_x_error (Display dpy, XErrorEvent event)	395	print_x_error (Display dpy, XErrorEvent event)
380	{	396	{
381	char buffer[BUFSIZ];	397	char buffer[BUFSIZ];
382	char mesg[BUFSIZ];	398	char mesg[BUFSIZ];
383	char number[32];	399	char number[32];
384		400
385	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");
386		402
387	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);	403	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);	404	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389		405
390	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);	406	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);	407	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
392	rxvt_warn ("+ %s: %s\n", mesg, buffer);	408	rxvt_warn ("+ %s: %s\n", mesg, buffer);
393		409
394	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);	410	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);	411	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396		412
397	if (event->request_code >= 128)	413	if (event->request_code >= 128)
398	{	414	{
399	#if 0	415	#if 0
400	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */	416	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401	int nexts;	417	int nexts;
402	char **exts = XListExtensions (dpy, &nexts);	418	char **exts = XListExtensions (dpy, &nexts);
403		419
404	while (nexts)	420	while (nexts)
405	{	421	{
406	char *extname = exts [nexts - 1];	422	char *extname = exts [nexts - 1];
407	int major, first_event, first_error;	423	int major, first_event, first_error;
408		424
409	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)	425	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410	{	426	{
411	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);	427	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);	428	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413		429
414	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);	430	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);	431	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416	rxvt_warn ("+ (which is %s)\n", buffer);	432	rxvt_warn ("+ (which is %s)\n", buffer);
417		433
418	break;	434	break;
419	}	435	}
420		436
421	printf ("nextss %d %s\n", nexts, extname);//D	437	printf ("nextss %d %s\n", nexts, extname);//D
422	--nexts;	438	--nexts;
423	++exts;	439	++exts;
424	}	440	}
425	#else	441	#else
426	int nexts = 0;	442	int nexts = 0;
427	char **exts = 0;	443	char **exts = 0;
428	#endif	444	#endif
429		445
430	if (!nexts)	446	if (!nexts)
431	{	447	{
432	rxvt_warn ("+ (which is an unknown extension)\n", buffer);	448	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433		449
434	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);	450	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);	451	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436		452
437	#if 0	453	#if 0
438	sprintf (number, "RENDER.%d", event->minor_code);	454	sprintf (number, "RENDER.%d", event->minor_code);
439	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);	455	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440	rxvt_warn ("+ (which is %s)\n", buffer);	456	rxvt_warn ("+ (which is %s)\n", buffer);
441	#endif	457	#endif
442	}	458	}
443		459
444	XFreeExtensionList (exts);	460	XFreeExtensionList (exts);
445	}	461	}
446	else	462	else
447	{	463	{
448	sprintf (number, "%d", event->request_code);	464	sprintf (number, "%d", event->request_code);
449	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);	465	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450	rxvt_warn ("+ (which is %s)\n", buffer);	466	rxvt_warn ("+ (which is %s)\n", buffer);
451	}	467	}
452		468
453	if (event->error_code == BadWindow	469	if (event->error_code == BadWindow
454	\|\| event->error_code == BadPixmap	470	\|\| event->error_code == BadPixmap
455	\|\| event->error_code == BadCursor	471	\|\| event->error_code == BadCursor
456	\|\| event->error_code == BadFont	472	\|\| event->error_code == BadFont
457	\|\| event->error_code == BadDrawable	473	\|\| event->error_code == BadDrawable
458	\|\| event->error_code == BadColor	474	\|\| event->error_code == BadColor
459	\|\| event->error_code == BadGC	475	\|\| event->error_code == BadGC
460	\|\| event->error_code == BadIDChoice	476	\|\| event->error_code == BadIDChoice
461	\|\| event->error_code == BadValue	477	\|\| event->error_code == BadValue
462	\|\| event->error_code == BadAtom)	478	\|\| event->error_code == BadAtom)
463	{	479	{
464	if (event->error_code == BadValue)	480	if (event->error_code == BadValue)
465	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);	481	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
466	else if (event->error_code == BadAtom)	482	else if (event->error_code == BadAtom)
467	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);	483	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
468	else	484	else
469	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);	485	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
470		486
471	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);	487	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472	}	488	}
473	}	489	}
474	#endif	490	#endif
475		491
476	int ecb_cold	492	int ecb_cold
477	rxvt_xerror_handler (Display display, XErrorEvent event)	493	rxvt_xerror_handler (Display display, XErrorEvent event)
478	{	494	{
479	if (GET_R->allowedxerror == -1)	495	if (GET_R && GET_R->allowedxerror == -1)
480	GET_R->allowedxerror = event->error_code;	496	GET_R->allowedxerror = event->error_code;
481	else	497	else
482	{	498	{
483	// 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,
484	// so just output the error and continue	500	// so just output the error and continue
…		…
817		833
818	delete fontset[0];	834	delete fontset[0];
819	fontset[0] = fs;	835	fontset[0] = fs;
820		836
821	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	837	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
822	prop.width += letterSpace;	838	prop.width = max (prop.width + letterSpace, 1);
823		839
824	fs->set_prop (prop, false);	840	fs->set_prop (prop, false);
825		841
826	fwidth = prop.width;	842	fwidth = prop.width;
827	fheight = prop.height + lineSpace;	843	fheight = prop.height + lineSpace;
…		…
927		943
928	void	944	void
929	rxvt_term::set_window_color (int idx, const char *color)	945	rxvt_term::set_window_color (int idx, const char *color)
930	{	946	{
931	#ifdef XTERM_COLOR_CHANGE	947	#ifdef XTERM_COLOR_CHANGE
932	rxvt_color xcol;
933
934	if (color == NULL \|\| *color == '\0')	948	if (color == NULL \|\| *color == '\0')
935	return;	949	return;
936		950
937	color = strdup (color);	951	color = strdup (color);
938	allocated.push_back ((void *)color);	952	allocated.push_back ((void *)color);
…		…
944	int i = atoi (color);	958	int i = atoi (color);
945		959
946	if (i >= 8 && i <= 15)	960	if (i >= 8 && i <= 15)
947	{	961	{
948	/* bright colors */	962	/* bright colors */
949	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	963	alias_color (idx, minBrightCOLOR + i - 8);
950	goto done;	964	goto done;
951	}	965	}
952		966
953	if (i >= 0 && i <= 7)	967	if (i >= 0 && i <= 7)
954	{	968	{
955	/* normal colors */	969	/* normal colors */
956	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	970	alias_color (idx, minCOLOR + i);
957	goto done;	971	goto done;
958	}	972	}
959	}	973	}
960		974
961	set_color (xcol, color);	975	pix_colors_focused[idx].free (this);
962		976	set_color (pix_colors_focused[idx], color);
963	/*
964	* FIXME: should free colors here, but no idea how to do it so instead,
965	* so just keep gobbling up the colormap
966	*/
967
968	pix_colors_focused[idx] = xcol;
969		977
970	done:	978	done:
971	/TODO: handle Color_BD, scrollbar background, etc. /	979	/TODO: handle Color_BD, scrollbar background, etc. /
972		980
973	update_fade_color (idx);	981	update_fade_color (idx);
974	recolour_cursor ();	982	recolor_cursor ();
975	scr_recolour ();	983	scr_recolor ();
976	#endif /* XTERM_COLOR_CHANGE */	984	#endif /* XTERM_COLOR_CHANGE */
977	}	985	}
978		986
979	void	987	void
980	rxvt_term::recolour_cursor ()	988	rxvt_term::recolor_cursor ()
981	{	989	{
982	XColor fg, bg;	990	XColor fg, bg;
983		991
984	(ISSET_PIXCOLOR (Color_pointer_fg)	992	(ISSET_PIXCOLOR (Color_pointer_fg)
985	? pix_colors_focused[Color_pointer_fg]	993	? pix_colors_focused[Color_pointer_fg]
…		…
1040	}	1048	}
1041		1049
1042	void	1050	void
1043	rxvt_term::alias_color (int dst, int src)	1051	rxvt_term::alias_color (int dst, int src)
1044	{	1052	{
		1053	pix_colors[dst].free (this);
1045	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]);
1046	}	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
1047		1075
1048	/* -------------------------------------------------------------------- *	1076	/* -------------------------------------------------------------------- *
1049	* - WINDOW RESIZING - *	1077	* - WINDOW RESIZING - *
1050	* -------------------------------------------------------------------- */	1078	* -------------------------------------------------------------------- */
1051	void	1079	void
…		…
1087	* 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
1088	* our position for handles and decorations. Counter it	1116	* our position for handles and decorations. Counter it
1089	*/	1117	*/
1090	if (x1 != x \|\| y1 != y)	1118	if (x1 != x \|\| y1 != y)
1091	{	1119	{
1092	x -= x1;	1120	unsigned int border_width = get_parent_bw (dpy, parent);
1093	y -= y1;	1121
		1122	x -= x1 + border_width;
		1123	y -= y1 + border_width;
1094	}	1124	}
1095		1125
1096	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1126	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1097	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1127	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1098	dx = old_width - szHint.width;	1128	dx = old_width - szHint.width;
…		…
1363	unsigned long fg, bg;	1393	unsigned long fg, bg;
1364	const char *p;	1394	const char *p;
1365	char **s;	1395	char **s;
1366	XIMStyles *xim_styles;	1396	XIMStyles *xim_styles;
1367		1397
1368	set_environ (envv);	1398	set_environ (env);
1369		1399
1370	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1400	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1371	return false;	1401	return false;
1372		1402
1373	input_method = display->get_xim (locale, modifiers);	1403	input_method = display->get_xim (locale, modifiers);
1374	if (input_method == NULL)	1404	if (input_method == NULL)
1375	return false;	1405	return false;
…		…
1683	rxvt_term::update_background ()	1713	rxvt_term::update_background ()
1684	{	1714	{
1685	if (update_background_ev.is_active ())	1715	if (update_background_ev.is_active ())
1686	return;	1716	return;
1687		1717
1688	bg_invalidate ();
1689
1690	if (!mapped)
1691	return;
1692
1693	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);	1718	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1694		1719
1695	if (to_wait <= 0.)	1720	if (to_wait <= 0.)
1696	bg_render ();	1721	bg_render ();
1697	else	1722	else

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.382 by root, Tue Jun 5 12:04:55 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.382 by root, Tue Jun 5 12:04:55 2012 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC