add another return, and return a value for a non-void funtion.

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 60418cd708eeb4ae569f2952a900c1545ba589ce..36a9f3cc5077c5bb46a73324e2b11853b4ecb1aa 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -26,7 +26,6 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-#include <X11/Xresource.h>
 
 #ifdef    TIME_WITH_SYS_TIME
 #  include <sys/time.h>
@@ -150,14 +149,15 @@ private:
 
     bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
       opaque_move, full_max, focus_new, focus_last, click_raise,
-      hide_toolbar, window_to_window_snap, window_corner_snap;
+      hide_toolbar, window_to_window_snap, window_corner_snap, aa_fonts;
     BColor border_color;
 
     unsigned int workspaces;
     int toolbar_placement, toolbar_width_percent, placement_policy,
       edge_snap_threshold, row_direction, col_direction;
 
-    unsigned int handle_width, bevel_width, frame_width, border_width;
+    unsigned int handle_width, bevel_width, frame_width, border_width,
+      resize_zones;
 
 #ifdef    HAVE_STRFTIME
     std::string strftime_format;
@@ -180,7 +180,8 @@ private:
   BColor readDatabaseColor(const std::string &rname,
                            const std::string &default_color,
                            const Configuration &style);
-  BFont *readDatabaseFont(const std::string &rname, const Configuration &style);
+  BFont *readDatabaseFont(const std::string &rbasename,
+                          const Configuration &style);
 
   void InitMenu(void);
   void LoadStyle(void);
@@ -204,6 +205,7 @@ public:
   inline bool doAutoRaise(void) const { return resource.auto_raise; }
   inline bool doClickRaise(void) const { return resource.click_raise; }
   inline bool isScreenManaged(void) const { return managed; }
+  inline bool doAAFonts(void) const { return resource.aa_fonts; }
   inline bool doImageDither(void) const { return image_control->doDither(); }
   inline bool doOrderedDither(void) const { return resource.ordered_dither; }
   inline bool doOpaqueMove(void) const { return resource.opaque_move; }
@@ -240,6 +242,8 @@ public:
   { return resource.frame_width; }
   inline unsigned int getBorderWidth(void) const
   { return resource.border_width; }
+  inline unsigned int getResizeZones(void) const
+  { return resource.resize_zones; }
 
   inline unsigned int getCurrentWorkspaceID(void)
   { return current_workspace->getID(); }
@@ -267,6 +271,7 @@ public:
   void saveColPlacementDirection(int d);
   void saveEdgeSnapThreshold(int t);
   void saveImageDither(bool d);
+  void saveAAFonts(bool f);
   void saveOpaqueMove(bool o);
   void saveFullMax(bool f);
   void saveFocusNew(bool f);
@@ -274,6 +279,7 @@ public:
   void saveHideToolbar(bool h);
   void saveWindowToWindowSnap(bool s);
   void saveWindowCornerSnap(bool s);
+  void saveResizeZones(unsigned int z);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -331,14 +337,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);