X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.cc;h=a2f362ecee43d8edc15a23b240b760d648a1b181;hb=e25a69cce8ed022113e1fb01b9bde1f5bcfb661c;hp=277924d6d9b4e63d90f94c3af57b67d95efde838;hpb=6b977b2ded0b8807dd05bb7ee0c318612600027d;p=chaz%2Fopenbox

diff --git a/otk/style.cc b/otk/style.cc
index 277924d6..a2f362ec 100644
--- a/otk/style.cc
+++ b/otk/style.cc
@@ -1,6 +1,8 @@
-#ifdef    HAVE_CONFIG_H
-#include "../config.h"
-#endif // HAVE_CONFIG_H
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
 
 #include <assert.h>
 #include <iostream>
@@ -232,53 +234,28 @@ BColor Style::readDatabaseColor(const std::string &rname,
 
 BFont *Style::readDatabaseFont(const std::string &rbasename,
                                const Configuration &style) {
-  std::string fontname;
+  std::string fontstring, s;
 
-  std::string s;
+  // XXX: load all this font stuff from the style...
 
-  int i;
-  if (style.getValue(rbasename + "xft.font", s) &&
-      style.getValue(rbasename + "xft.size", i)) {
-    std::string family = s;
-    bool bold = False;
-    bool italic = False;
-    bool dropShadow = False;
-
-    if (style.getValue(rbasename + "xft.flags", s)) {
-      if (s.find("bold") != std::string::npos)
-        bold = True;
-      if (s.find("italic") != std::string::npos)
-        italic = True;
-      if (s.find("shadow") != std::string::npos)
-        dropShadow = True;
-    }
+  bool dropShadow = True;
     
-    unsigned char offset = 1;
-    if (style.getValue(rbasename + "xft.shadow.offset", s)) {
-      offset = atoi(s.c_str()); //doesn't detect errors
-      if (offset > CHAR_MAX)
-        offset = 1;
-    }
-
-    unsigned char tint = 0x40;
-    if (style.getValue(rbasename + "xft.shadow.tint", s)) {
-      tint = atoi(s.c_str());
-    }
+  unsigned char offset = 1;
+  if (style.getValue(rbasename + "xft.shadow.offset", s)) {
+    offset = atoi(s.c_str()); //doesn't detect errors
+    if (offset > CHAR_MAX)
+      offset = 1;
+  }
 
-    
-    BFont *b = new BFont(screen_number, family, i, bold, italic,
-                         dropShadow && shadow_fonts,
-                         offset, tint, aa_fonts);
-    if (b->valid())
-      return b;
-    delete b;
+  unsigned char tint = 0x40;
+  if (style.getValue(rbasename + "xft.shadow.tint", s)) {
+    tint = atoi(s.c_str());
   }
 
-  if (style.getValue(rbasename + "xft.font", s))
-    printf("Unable to load font \"%s\". Exiting\n", s.c_str());
-  else
-    printf("Font not defined by style. Exiting\n");
-  exit(2);  // can't continue without a font
+  fontstring = "Arial,Sans-9:bold";
+
+  // if this fails, it ::exit()'s
+  return new BFont(screen_number, fontstring, dropShadow, offset, tint);
 }
 
 }