big fat commit..

[chaz/openbox] / src / font.hh

diff --git a/src/font.hh b/src/font.hh
index f28a0ac5c21ae4a492a1ac3638b0c7fae90572a5..c070bbff9a4511d2589878eca0f171c3daba0d7e 100644 (file)
--- a/src/font.hh
+++ b/src/font.hh
@@ -1,35 +1,11 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
-// Font.hh for Blackbox - an X11 Window manager
-// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
 #ifndef   __Font_hh
 #define   __Font_hh
 
 extern "C" {
 #include <X11/Xlib.h>
 
-#ifdef XFT
-#  include <X11/Xft/Xft.h>
-#endif
+#include <X11/Xft/Xft.h>
 }
 
 #include <assert.h>
@@ -69,7 +45,6 @@ private:
   bool              _bold;
   bool              _italic;
 
-#ifdef XFT
   bool              _antialias;
   bool              _shadow;
   unsigned char     _offset;
@@ -78,31 +53,14 @@ private:
   XftFont          *_xftfont;
 
   bool createXftFont(void);
-#endif
-  
-  // standard
-  XFontStruct      *_font;
-  // multibyte
-  XFontSet          _fontset;
-  XFontSetExtents  *_fontset_extents;
-
-  std::string buildXlfd(void) const;
-  std::string buildMultibyteXlfd(void) const;
-
-  bool createXFont(const std::string &xlfd);
-  bool parseXlfd(const std::string &xlfd);
   
   bool              _valid;
 
 public:
-#ifdef XFT
   // loads an Xft font
   BFont(Display *d, BScreen *screen, const std::string &family, int size,
         bool bold, bool italic, bool shadow, unsigned char offset, 
         unsigned char tint, bool antialias = True);
-#endif
-  // loads a standard X font
-  BFont(Display *d, BScreen *screen, const std::string &xlfd);
   virtual ~BFont(void);
 
   inline bool valid(void) const { return _valid; }