move the shit from OBRootWindow into OBScreen

diff --git a/src/rootwindow.cc b/src/rootwindow.cc
deleted file mode 100644 (file)
index 0b7de57..0000000
--- a/src/rootwindow.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
-#include "rootwindow.hh"
-#include "openbox.hh"
-#include "screen.hh"
-#include "client.hh"
-#include "otk/display.hh"
-
-namespace ob {
-
-OBRootWindow::OBRootWindow(int screen)
-  : OBWidget(OBWidget::Type_Root),
-    _info(otk::OBDisplay::screenInfo(screen))
-{
-  updateDesktopNames();
-
-  Openbox::instance->registerHandler(_info->rootWindow(), this);
-}
-
-
-OBRootWindow::~OBRootWindow()
-{
-}
-
-
-
-
-
-}

diff --git a/src/rootwindow.hh b/src/rootwindow.hh
deleted file mode 100644 (file)
index 241b35c..0000000
--- a/src/rootwindow.hh
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef   __rootwindow_hh
-#define   __rootwindow_hh
-
-/*! @file rootwindow.hh
-  @brief The OBClient class maintains the state of a client window by handling
-  property changes on the window and some client messages
-*/
-
-extern "C" {
-#include <X11/Xlib.h>
-
-#ifdef    SHAPE
-#include <X11/extensions/shape.h>
-#endif // SHAPE
-}
-
-#include <string>
-#include <vector>
-
-#include "widget.hh"
-#include "otk/screeninfo.hh"
-#include "otk/eventhandler.hh"
-#include "otk/property.hh"
-
-namespace ob {
-
-//! Maintains the state of a root window's properties.
-/*!
-  OBRootWindow maintains the state of a root window. The state consists of the
-  hints that the wm sets on the window, such as the number of desktops,
-  gravity.
-  <p>
-  OBRootWindow also manages client messages for the root window.
-*/
-class OBRootWindow : public otk::OtkEventHandler, public OBWidget {
-private:
-  //! Information about this screen
-  const otk::ScreenInfo *_info;
-
-  //! The names of all desktops
-  otk::OBProperty::StringVect _names;
-
-  //! Get desktop names from the 
-  void updateDesktopNames();
-
-public:
-  //! Constructs a new OBRootWindow for a screen
-  /*!
-    @param screen The screen whose root window to wrap
-  */
-  OBRootWindow(int screen);
-  //! Destroys the OBRootWindow object
-  virtual ~OBRootWindow();
-
-  //! Sets the name of all desktops
-  void setDesktopNames(const otk::OBProperty::StringVect &names);
-  
-  //! Sets the name of a desktop
-  /*!
-    @param i The index of the desktop to set the name for (base 0)
-    @param name The name to set for the desktop
-  */
-  void setDesktopName(int i, const std::string &name);
-
-  virtual void propertyHandler(const XPropertyEvent &e);
-  virtual void clientMessageHandler(const XClientMessageEvent &e);
-  virtual void mapRequestHandler(const XMapRequestEvent &e);
-};
-
-}
-
-#endif // __client_hh