From 4c5b0945c8c9e64a48e077f377a0e83370d5878f Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 27 Nov 2002 17:48:52 +0000
Subject: [PATCH] add a few patches I missed in the upgrade to 0.1.13.

second try, gooo CVS!

--
From: MAINTAINER
---
 x11/fluxbox/patches/patch-src_Font_cc   | 20 ++++++++++++++++++++
 x11/fluxbox/patches/patch-src_Screen_cc | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 x11/fluxbox/patches/patch-src_Font_cc
 create mode 100644 x11/fluxbox/patches/patch-src_Screen_cc

diff --git a/x11/fluxbox/patches/patch-src_Font_cc b/x11/fluxbox/patches/patch-src_Font_cc
new file mode 100644
index 00000000000..789b71e0bd5
--- /dev/null
+++ b/x11/fluxbox/patches/patch-src_Font_cc
@@ -0,0 +1,20 @@
+Fixes start-up problems with aa-fonts
+--- src/Font.cc.orig	Fri Oct 25 23:06:45 2002
++++ src/Font.cc	Sun Nov 24 07:21:51 2002
+@@ -139,14 +139,8 @@ void Font::setAntialias(bool flag) {
+ bool Font::load(const char *name) {
+ 	if (name == 0)
+ 		return false;
+-	bool ret_val = m_fontimp->load(name);
+-	if (ret_val && name == 0) { //prevent from having a bad fontimp
+-		m_fontstr = name; // if the load really succeded then set font string
+-	} else {
+-		m_fontstr = "";
+-	}
+-
+-	return ret_val;
++	m_fontstr = name;
++	return m_fontimp->load(name);
+ }
+ 
+ unsigned int Font::textWidth(const char * const text, unsigned int size) const {
diff --git a/x11/fluxbox/patches/patch-src_Screen_cc b/x11/fluxbox/patches/patch-src_Screen_cc
new file mode 100644
index 00000000000..5a74003ce93
--- /dev/null
+++ b/x11/fluxbox/patches/patch-src_Screen_cc
@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_Screen_cc,v 1.3 2002/11/27 17:48:52 brad Exp $
+
+--- src/Screen.cc.orig	Sun Nov 17 12:27:28 2002
++++ src/Screen.cc	Sun Nov 24 07:21:51 2002
+@@ -284,7 +284,7 @@ resource(rm, screenname, altscreenname)
+ 	image_control->setDither(*resource.image_dither);
+ 	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(), 
+ 			image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
+-
++	theme->reconfigure(*resource.antialias);
+ 
+ 	const char *s =	i18n->getMessage(
+ 		FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
+@@ -447,7 +447,6 @@ resource(rm, screenname, altscreenname)
+ 
+ 	XFree(children);
+ 	XFlush(getBaseDisplay()->getXDisplay());
+-	theme->reconfigure(*resource.antialias);
+ }
+ 
+ namespace {