X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FScreen.hh;h=3ce57db3db03cfcea9e1f8ed619a907cdf575b9d;hb=6716bd33235b6fda4aeea75aea7c446e9f27fe40;hp=72e7dc0aca91f229a689297a0587e843279b5d11;hpb=eb136b9629b61d43c00c3cf105ff170fb8c75ad1;p=chaz%2Fopenbox

diff --git a/src/Screen.hh b/src/Screen.hh
index 72e7dc0a..3ce57db3 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -54,7 +54,9 @@ extern "C" {
 #include "Workspace.hh"
 #include "Workspacemenu.hh"
 #include "blackbox.hh"
+
 class Slit; // forward reference
+class BFont;
 class XAtom;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
@@ -65,37 +67,31 @@ struct WindowStyle {
   BTexture t_focus, t_unfocus, l_focus, l_unfocus, h_focus, h_unfocus,
     b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
 
-  XFontSet fontset;
-  XFontSetExtents *fontset_extents;
-  XFontStruct *font;
+  BFont *font;
 
   TextJustify justify;
 
-  int doJustify(const char *text, int &start_pos, unsigned int max_length,
-                unsigned int modifier, bool multibyte) const;
+  void doJustify(const std::string &text, int &start_pos,
+                 unsigned int max_length, unsigned int modifier) const;
 };
 
 struct ToolbarStyle {
   BColor l_text, w_text, c_text, b_pic;
   BTexture toolbar, label, window, button, pressed, clock;
 
-  XFontSet fontset;
-  XFontSetExtents *fontset_extents;
-  XFontStruct *font;
+  BFont *font;
 
   TextJustify justify;
 
-  int doJustify(const char *text, int &start_pos, unsigned int max_length,
-                unsigned int modifier, bool multibyte) const;
+  void doJustify(const std::string &text, int &start_pos,
+                 unsigned int max_length, unsigned int modifier) const;
 };
 
 struct MenuStyle {
   BColor t_text, f_text, h_text, d_text;
   BTexture title, frame, hilite;
 
-  XFontSet t_fontset, f_fontset;
-  XFontSetExtents *t_fontset_extents, *f_fontset_extents;
-  XFontStruct *t_font, *f_font;
+  BFont *t_font, *f_font;
 
   TextJustify t_justify, f_justify;
   int bullet, bullet_pos;
@@ -180,13 +176,11 @@ private:
 
   BTexture readDatabaseTexture(const std::string &rname,
                                const std::string &default_color,
-                               Configuration &style);
+                               const Configuration &style);
   BColor readDatabaseColor(const std::string &rname,
                            const std::string &default_color,
-                           Configuration &style);
-  XFontSet readDatabaseFontSet(const std::string &rname, Configuration &style);
-  XFontStruct *readDatabaseFont(const std::string &rname, Configuration &style);
-  XFontSet createFontSet(const std::string &fontname);
+                           const Configuration &style);
+  BFont *readDatabaseFont(const std::string &rname, const Configuration &style);
 
   void InitMenu(void);
   void LoadStyle(void);
@@ -337,14 +331,13 @@ public:
   void save_rc(void);
   void reconfigure(void);
   void toggleFocusModel(FocusModel model);
-  void updateFocusModel(void);
   void rereadMenu(void);
   void shutdown(void);
   void showPosition(int x, int y);
   void showGeometry(unsigned int gx, unsigned int gy);
   void hideGeometry(void);
 
-  void buttonPressEvent(XButtonEvent *xbutton);
+  void buttonPressEvent(const XButtonEvent *xbutton);
 
   void updateNetizenCurrentWorkspace(void);
   void updateNetizenWorkspaceCount(void);