add a few patches I missed in the upgrade to 0.1.13.

second try, gooo CVS!

--
From: MAINTAINER
This commit is contained in:
brad 2002-11-27 17:48:52 +00:00
parent ab3968e158
commit 4c5b0945c8
2 changed files with 41 additions and 0 deletions

View File

@ -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 {

View File

@ -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 {