X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.cc;h=3c40e24bb5fcc87773aac642c50b45b881c8de5d;hb=6f5e60f0337e60d904a8f549aeaa631afefc8033;hp=aa8213007d93f390a627c089b2858ed562f7cc5f;hpb=ec4548a19b1d1172d031bee8b277089a59fcfd2f;p=chaz%2Fopenbox

diff --git a/otk/style.cc b/otk/style.cc
index aa821300..3c40e24b 100644
--- a/otk/style.cc
+++ b/otk/style.cc
@@ -3,8 +3,9 @@
 #endif // HAVE_CONFIG_H
 
 #include <assert.h>
-#include "display.hh"
+#include <iostream>
 
+#include "display.hh"
 #include "util.hh"
 #include "style.hh"
 
@@ -14,13 +15,9 @@ Style::Style() : font(NULL)
 {
 }
 
-Style::Style(unsigned int screen)
-  : font(0), screen_number(screen)
-{
-}
-
-Style::Style(unsigned int screen, BImageControl *ctrl)
-  : image_control(ctrl), font(0), screen_number(screen)
+Style::Style(BImageControl *ctrl)
+  : image_control(ctrl), font(0),
+    screen_number(ctrl->getScreenInfo()->getScreenNumber())
 {
 }
 
@@ -43,7 +40,7 @@ Style::~Style() {
   stick_button.mask = None;
 }
 
-void Style::load(Configuration &style) {
+void Style::load(const Configuration &style) {
   std::string s;
 
   // load fonts/fontsets
@@ -260,7 +257,7 @@ BColor Style::readDatabaseColor(const std::string &rname,
 
 
 BFont *Style::readDatabaseFont(const std::string &rbasename,
-                                    const Configuration &style) {
+                               const Configuration &style) {
   std::string fontname;
 
   std::string s;
@@ -302,7 +299,11 @@ BFont *Style::readDatabaseFont(const std::string &rbasename,
       return b;
     delete b;
   }
-    
+
+  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
 }