summaryrefslogtreecommitdiff
path: root/src/XAtom.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-05-23 14:53:06 +0000
committerDana Jansens <danakj@orodu.net>2002-05-23 14:53:06 +0000
commita85c9a7c6e88d94a833941d3efc368cf11243579 (patch)
treea8a3a4edaeda1a6914cd2b4db4d02b0f4ae0019f /src/XAtom.cc
parent83347770a6f3ebdeec85945a7e28246030f53571 (diff)
added XAtom class, and it all now compiles.
Diffstat (limited to 'src/XAtom.cc')
-rw-r--r--src/XAtom.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/XAtom.cc b/src/XAtom.cc
index 98f7d8d1..0f36ef9b 100644
--- 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);