removing old Makefile.in, rolling back Makefile.am to before the mappable muse button...

[chaz/openbox] / src / Window.hh

diff --git a/src/Window.hh b/src/Window.hh
index ea5c0d733c07f41a68655a1827b24faa2783ba92..0f3fb14d3cf25df166f906629bcefc3b3c040e90 100644 (file)
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -38,11 +38,6 @@ extern "C" {
 #include "Timer.hh"
 #include "Util.hh"
 #include "Windowmenu.hh"
-#include "Workspace.hh"
-#include "Screen.hh"
-
-class XAtom;
-class BInput;
 
 #define MwmHintsFunctions     (1l << 0)
 #define MwmHintsDecorations   (1l << 1)
@@ -131,7 +126,6 @@ private:
   Blackbox *blackbox;
   BScreen *screen;
   XAtom *xatom;
-  BInput *input;
   BTimer *timer;
   BlackboxAttributes blackbox_attrib;
 
@@ -288,13 +282,14 @@ private:
   void destroyIconifyButton(void);
   void createMaximizeButton(void);
   void destroyMaximizeButton(void);
-  void redrawLabel(void);
-  void redrawAllButtons(void);
-  void redrawCloseButton(bool pressed);
-  void redrawIconifyButton(bool pressed);
-  void redrawMaximizeButton(bool pressed);
-  void restoreGravity(void);
-  void setGravityOffsets(void);
+  void redrawWindowFrame(void) const;
+  void redrawLabel(void) const;
+  void redrawAllButtons(void) const;
+  void redrawCloseButton(bool pressed) const;
+  void redrawIconifyButton(bool pressed) const;
+  void redrawMaximizeButton(bool pressed) const;
+  void applyGravity(Rect &r);
+  void restoreGravity(Rect &r);
   void setAllowedActions(void);
   void setState(unsigned long new_state);
   void upsize(void);
@@ -323,7 +318,6 @@ public:
   inline bool isIconifiable(void) const { return functions & Func_Iconify; }
   inline bool isMaximizable(void) const { return functions & Func_Maximize; }
   inline bool isResizable(void) const { return functions & Func_Resize; }
-  inline bool isMovable(void) const { return functions & Func_Move; }
   inline bool isClosable(void) const { return functions & Func_Close; }
   inline bool isDesktop(void) const { return window_type == Type_Desktop; }
 
@@ -378,18 +372,14 @@ public:
   void iconify(void);
   void deiconify(bool reassoc = True, bool raise = True);
   void show(void);
-  void showWindowMenu(int root_x, int root_y);
   void close(void);
   void withdraw(void);
   void maximize(unsigned int button);
   void remaximize(void);
   void shade(void);
   void stick(void);
-  void raise(void);
-  void lower(void);
   void reconfigure(void);
-  void grabButtons(void);
-  void ungrabButtons(void);
+  void updateFocusModel(void);
   void installColormap(bool install);
   void restore(bool remap);
   void configure(int dx, int dy, unsigned int dw, unsigned int dh);