1 files changed, 23 insertions, 29 deletions

diff --git a/src/Netizen.hh b/src/Netizen.hh
index 1c4a2b4..53d2789 100644
--- a/src/Netizen.hh
+++ b/src/Netizen.hh
@@ -1,3 +1,6 @@
+// Netizen.hh for Fluxbox 
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Netizen.hh for Blackbox - An X11 Window Manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -13,50 +16,41 @@
 //
 // 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
+// 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   _NETIZEN_HH_
-#define   _NETIZEN_HH_
-
-// forward declaration
-class Netizen;
+#ifndef  NETIZEN_HH
+#define  NETIZEN_HH
 
 #include <X11/Xlib.h>
 
-#include "BaseDisplay.hh"
-#include "Screen.hh"
-
+class BScreen;
 
 class Netizen {
-private:
-  BaseDisplay *basedisplay;
-  BScreen *screen;
-  Window window;
-  XEvent event;
-
-
-protected:
-
-
 public:
-  Netizen(BScreen *, Window);
+    Netizen(const BScreen &scr, Window w);
 
-  inline const Window &getWindowID(void) const { return window; }
+    inline Window window() const { return m_window; }
 
-  void sendWorkspaceCount(void);
-  void sendCurrentWorkspace(void);
+    void sendWorkspaceCount();
+    void sendCurrentWorkspace();
 
-  void sendWindowFocus(Window);
-  void sendWindowAdd(Window, unsigned long);
-  void sendWindowDel(Window);
-  void sendWindowRaise(Window);
-  void sendWindowLower(Window);
+    void sendWindowFocus(Window w);
+    void sendWindowAdd(Window w, unsigned long wkspc);
+    void sendWindowDel(Window w);
+    void sendWindowRaise(Window w);
+    void sendWindowLower(Window w);
+
+    void sendConfigNotify(XEvent &xe);
+private:
+    const BScreen &m_screen;
+    Display *m_display; ///< display connection
+    Window m_window;
+    XEvent event;
 
-  void sendConfigNotify(XEvent *);
 };