nls from bb-cvs

[chaz/openbox] / src / XAtom.cc

diff --git a/src/XAtom.cc b/src/XAtom.cc
index 98f7d8d12ba530a2767a1cc16ee7a993ac32b313..9e5901265f0b5953c93e7719a45d5bdeecea3ec6 100644 (file)
--- a/src/XAtom.cc
+++ b/src/XAtom.cc
@@ -20,12 +20,12 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "XAtom.h"
-#include "XDisplay.h"
-#include "XScreen.h"
+#include "openbox.h"
+#include "Screen.h"
 #include "Util.h"
 
-XAtom::XAtom(const XDisplay *display) {
-  _display = display->_display;
+XAtom::XAtom(Openbox &ob) {
+  _display = ob.getXDisplay();
 
 #ifdef    HAVE_GETPID
   openbox_pid = getAtom("_BLACKBOX_PID");
@@ -86,8 +86,8 @@ XAtom::XAtom(const XDisplay *display) {
 
   net_wm_ping = getAtom("_NET_WM_PING");
 
-  for (int s = 0, c = display->screenCount(); s < c; ++s)
-    setSupported(display->screen(s));
+  for (unsigned int s = 0, c = ob.managedScreenCount(); s < c; ++s)
+    setSupported( static_cast<ScreenInfo*>(ob.getScreen(s)) );
 }
 
 
@@ -115,9 +115,9 @@ Atom XAtom::getAtom(const char *name) const {
 /*
  * Sets which atoms are supported for NETWM, by Openbox, on the root window.
  */
-void XAtom::setSupported(const XScreen *screen) {
+void XAtom::setSupported(const ScreenInfo *screen) {
   // create the netwm support window
-  Window w = XCreateSimpleWindow(_display, screen->rootWindow(),
+  Window w = XCreateSimpleWindow(_display, screen->getRootWindow(),
                                  0, 0, 1, 1, 0, 0, 0);
   ASSERT(w != None);
   _support_windows.push_back(w);
@@ -182,7 +182,8 @@ void XAtom::setPixmapValue(Window win, Atom atom, Pixmap value) const {
 /*
  * Set a string property value on a window.
  */
-void XAtom::setStringValue(Window win, Atom atom, std::string &value) const {
+void XAtom::setStringValue(Window win, Atom atom,
+                           const std::string &value) const {
   setValue(win, atom, XA_STRING,
            const_cast<unsigned char*>
            (reinterpret_cast<const unsigned char*>(value.c_str())),
@@ -229,7 +230,8 @@ void XAtom::addPixmapValue(Window win, Atom atom, Pixmap value) const {
 /*
  * Add characters to a string property value on a window.
  */
-void XAtom::addStringValue(Window win, Atom atom, std::string &value) const {
+void XAtom::addStringValue(Window win, Atom atom,
+                           const std::string &value) const {
   setValue(win, atom, XA_STRING,
            const_cast<unsigned char*>
            (reinterpret_cast<const unsigned char *>
@@ -328,10 +330,10 @@ bool XAtom::getPixmapValue(Window win, Atom atom, unsigned long *nelements,
 /*
  * Gets an string property's value from a window.
  */
-bool XAtom::getStringValue(Window win, Atom atom, unsigned long *nelements,
-                     std::string &value) const {
+bool XAtom::getStringValue(Window win, Atom atom, std::string &value) const {
   unsigned char *data;
-  bool ret = XAtom::getValue(win, atom, XA_STRING, nelements, &data, 8);
+  unsigned long nelements;
+  bool ret = XAtom::getValue(win, atom, XA_STRING, &nelements, &data, 8);
   if (ret)
     value = reinterpret_cast<char*>(data);
   return ret;