#include <X11/Xft/Xft.h>
}
-#include <assert.h>
+#include <cassert>
namespace otk {
* static members
*/
private:
- static std::string _fallback_font;
- static bool _xft_init;
+ static bool _xft_init;
-public:
- // the fallback is only used for X fonts, not for Xft fonts, since it is
- // assumed that X fonts will be the fallback from Xft.
- inline static std::string fallbackFont(void) { return _fallback_font; }
- inline static void setFallbackFont(const std::string &f)
- { _fallback_font = f; }
-
- /*
- * instance members
- */
-private:
int _screen_num;
std::string _fontstring;
inline const std::string &fontstring() const { return _fontstring; }
- unsigned int height() const;
- unsigned int maxCharWidth() const;
+ int height() const;
+ int maxCharWidth() const;
- unsigned int measureString(const ustring &string) const;
+ int measureString(const ustring &string) const;
// The RenderControl classes use the internal data to render the fonts, but
// noone else needs it, so its private.