nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile time option for multibyte support

Browse source
This commit is contained in:
fluxgen 2002-10-25 21:07:07 +00:00
parent a0abbf6056
commit db886fc7c8
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Font.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
//$Id: Font.cc,v 1.18 2002/10/24 11:30:45 fluxgen Exp $ //$Id: Font.cc,v 1.19 2002/10/25 21:07:07 fluxgen Exp $
#include "Font.hh" #include "Font.hh"
@ -34,9 +34,13 @@
#include "XftFontImp.hh" #include "XftFontImp.hh"
#endif // USE_XFT #endif // USE_XFT
// for multibyte support
#ifdef USE_XMB
#include "XmbFontImp.hh"
#endif //USE_XMB
// standard font system // standard font system
#include "XFontImp.hh" #include "XFontImp.hh"
#include "XmbFontImp.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
@ -58,8 +62,6 @@ using namespace std;
#include <locale.h> #include <locale.h>
#endif //HAVE_SETLOCALE #endif //HAVE_SETLOCALE
namespace FbTk { namespace FbTk {
bool Font::m_multibyte = false; bool Font::m_multibyte = false;
@ -92,9 +94,11 @@ m_antialias(false) {
#endif //USE_XFT #endif //USE_XFT
// if we didn't create a Xft font then create basic font // if we didn't create a Xft font then create basic font
if (m_fontimp.get() == 0) { if (m_fontimp.get() == 0) {
#ifdef USE_XMB
if (m_multibyte || m_utf8mode) if (m_multibyte || m_utf8mode)
m_fontimp.reset(new XmbFontImp(0, m_utf8mode)); m_fontimp.reset(new XmbFontImp(0, m_utf8mode));
else // basic font implementation else // basic font implementation
#endif // USE_XMB
m_fontimp.reset(new XFontImp()); m_fontimp.reset(new XFontImp());
} }
@ -116,11 +120,12 @@ void Font::setAntialias(bool flag) {
} else if (!flag && isAntialias()) } else if (!flag && isAntialias())
#endif // USE_XFT #endif // USE_XFT
{ {
#ifdef USE_XMB
if (m_multibyte || m_utf8mode) if (m_multibyte || m_utf8mode)
m_fontimp.reset(new XmbFontImp(m_fontstr.c_str(), m_utf8mode)); m_fontimp.reset(new XmbFontImp(m_fontstr.c_str(), m_utf8mode));
else { else
#endif // USE_XMB
m_fontimp.reset(new XFontImp(m_fontstr.c_str())); m_fontimp.reset(new XFontImp(m_fontstr.c_str()));
}
} }
if (m_fontimp->loaded() != loaded) { // if the new font failed to load, fall back to 'fixed' if (m_fontimp->loaded() != loaded) { // if the new font failed to load, fall back to 'fixed'