1 files changed, 68 insertions, 68 deletions

diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 949890e..c5a8366 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Font.cc,v 1.1 2002/11/26 16:01:27 fluxgen Exp $
+//$Id: Font.cc,v 1.2 2002/12/01 13:42:14 rathnor Exp $
 
 
 #include "Font.hh"
@@ -66,43 +66,43 @@ bool Font::m_multibyte = false;
 bool Font::m_utf8mode = false;
 
 Font::Font(const char *name, bool antialias):
-m_fontimp(0),
-m_antialias(false), m_rotated(false) {
+    m_fontimp(0),
+    m_antialias(false), m_rotated(false) {
         
-        // MB_CUR_MAX returns the size of a char in the current locale
-        if (MB_CUR_MAX > 1) // more than one byte, then we're multibyte
-                m_multibyte = true;
-
-        char *s; // temporary string for enviroment variable
-        // check for utf-8 mode
-        if (((s = getenv("LC_ALL")) && *s) ||
-                ((s = getenv("LC_CTYPE")) && *s) ||
-                ((s = getenv("LANG")) && *s)) {
-                if (strstr(s, "UTF-8"))
-                        m_utf8mode = true;
-        }
-
-        // create the right font implementation
-        // antialias is prio 1
+    // MB_CUR_MAX returns the size of a char in the current locale
+    if (MB_CUR_MAX > 1) // more than one byte, then we're multibyte
+        m_multibyte = true;
+
+    char *s; // temporary string for enviroment variable
+    // check for utf-8 mode
+    if (((s = getenv("LC_ALL")) && *s) ||
+        ((s = getenv("LC_CTYPE")) && *s) ||
+        ((s = getenv("LANG")) && *s)) {
+        if (strstr(s, "UTF-8"))
+            m_utf8mode = true;
+    }
+
+    // create the right font implementation
+    // antialias is prio 1
 #ifdef USE_XFT
-        if (antialias) {
-                m_fontimp.reset(new XftFontImp(0, m_utf8mode));
-                m_antialias = true;
-        }
+    if (antialias) {
+        m_fontimp.reset(new XftFontImp(0, m_utf8mode));
+        m_antialias = true;
+    }
 #endif //USE_XFT
-        // if we didn't create a Xft font then create basic font
-        if (m_fontimp.get() == 0) {
+    // if we didn't create a Xft font then create basic font
+    if (m_fontimp.get() == 0) {
 #ifdef USE_XMB
-                if (m_multibyte || m_utf8mode)
-                        m_fontimp.reset(new XmbFontImp(0, m_utf8mode));
-                else // basic font implementation
+        if (m_multibyte || m_utf8mode)
+            m_fontimp.reset(new XmbFontImp(0, m_utf8mode));
+        else // basic font implementation
 #endif // USE_XMB
-                        m_fontimp.reset(new XFontImp());
-        }
+            m_fontimp.reset(new XFontImp());
+    }
         
-        if (name != 0) {
-                load(name);
-        }
+    if (name != 0) {
+        load(name);
+    }
 
 }
 
@@ -111,74 +111,74 @@ Font::~Font() {
 }
 
 void Font::setAntialias(bool flag) {
-        bool loaded = m_fontimp->loaded();
+    bool loaded = m_fontimp->loaded();
 #ifdef USE_XFT
-        if (flag && !isAntialias() && !m_rotated) {
-                m_fontimp.reset(new XftFontImp(m_fontstr.c_str(), m_utf8mode));
-        } else if (!flag && isAntialias()) 
+    if (flag && !isAntialias() && !m_rotated) {
+        m_fontimp.reset(new XftFontImp(m_fontstr.c_str(), m_utf8mode));
+    } else if (!flag && isAntialias()) 
 #endif // USE_XFT
         {
 #ifdef USE_XMB
-                if (m_multibyte || m_utf8mode)
-                        m_fontimp.reset(new XmbFontImp(m_fontstr.c_str(), m_utf8mode));
-                else
+            if (m_multibyte || m_utf8mode)
+                m_fontimp.reset(new XmbFontImp(m_fontstr.c_str(), m_utf8mode));
+            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->load("fixed")) // if that failes too, output warning
-                        cerr<<"Warning: can't load fallback font 'fixed'."<<endl;
-        }
+    if (m_fontimp->loaded() != loaded) { // if the new font failed to load, fall back to 'fixed'
+        if (!m_fontimp->load("fixed")) // if that failes too, output warning
+            cerr<<"Warning: can't load fallback font 'fixed'."<<endl;
+    }
 
-        m_antialias = flag;
+    m_antialias = flag;
 }
 
 bool Font::load(const char *name) {
-        if (name == 0)
-                return false;
-        m_fontstr = name;
-        return m_fontimp->load(name);
+    if (name == 0)
+        return false;
+    m_fontstr = name;
+    return m_fontimp->load(name);
 }
 
 unsigned int Font::textWidth(const char * const text, unsigned int size) const {
-        return m_fontimp->textWidth(text, size);
+    return m_fontimp->textWidth(text, size);
 }
 
 unsigned int Font::height() const {
-        return m_fontimp->height();
+    return m_fontimp->height();
 }
 
 int Font::ascent() const {
-        return m_fontimp->ascent();
+    return m_fontimp->ascent();
 }
 
 int Font::descent() const { 
-        return m_fontimp->descent();
+    return m_fontimp->descent();
 }
 void Font::drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const {
-        if (text == 0 || len == 0)
-                return;
-        m_fontimp->drawText(w, screen, gc, text, len, x, y);            
+    if (text == 0 || len == 0)
+        return;
+    m_fontimp->drawText(w, screen, gc, text, len, x, y);                
 }       
 
 void Font::rotate(float angle) {
 #ifdef USE_XFT
-        // if we are rotated and we are changing to horiz text 
-        // and we were antialiased before we rotated then change to XftFontImp
-        if (isRotated() && angle == 0 && isAntialias())
-                m_fontimp.reset(new XftFontImp(m_fontstr.c_str(), m_utf8mode));
+    // if we are rotated and we are changing to horiz text 
+    // and we were antialiased before we rotated then change to XftFontImp
+    if (isRotated() && angle == 0 && isAntialias())
+        m_fontimp.reset(new XftFontImp(m_fontstr.c_str(), m_utf8mode));
 #endif // USE_XFT
-        // change to a font imp that handles rotated fonts (i.e just XFontImp at the moment)
-        // if we're going to rotate this font
-        if (angle != 0 && isAntialias() && !isRotated()) {
-                m_fontimp.reset(new XFontImp(m_fontstr.c_str()));
-        }
+    // change to a font imp that handles rotated fonts (i.e just XFontImp at the moment)
+    // if we're going to rotate this font
+    if (angle != 0 && isAntialias() && !isRotated()) {
+        m_fontimp.reset(new XFontImp(m_fontstr.c_str()));
+    }
 
-        //Note: only XFontImp implements FontImp::rotate
-        m_fontimp->rotate(angle);
+    //Note: only XFontImp implements FontImp::rotate
+    m_fontimp->rotate(angle);
 
-        m_rotated = (angle == 0 ? false : true);
+    m_rotated = (angle == 0 ? false : true);
 }
 
 };