X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FNetizen.cc;h=6d73be95e8cd269dfe762ef895a17d9b0a83e404;hb=a7db565c75f316fd04ccb04004b58f6378af63c9;hp=6fbb99acc33eae58ecbe50f37b5e390f5d16c2fa;hpb=1b1efab489353734f0047f97fe5fef7f96d0ee68;p=chaz%2Fopenbox

diff --git a/src/Netizen.cc b/src/Netizen.cc
index 6fbb99ac..6d73be95 100644
--- a/src/Netizen.cc
+++ b/src/Netizen.cc
@@ -1,4 +1,5 @@
-// Netizen.cc for Openbox
+// -*- mode: C++; indent-tabs-mode: nil; -*-
+// Netizen.cc for Blackbox - An X11 Window Manager
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -20,95 +21,94 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef    HAVE_CONFIG_H
 #include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#include "Netizen.h"
-#include "Screen.h"
+#include "Netizen.hh"
+#include "Screen.hh"
+
+Netizen::Netizen(BScreen *scr, Window win) {
+  screen = scr;
+  blackbox = scr->getBlackbox();
+  window = win;
 
-Netizen::Netizen(BScreen &scr, Window win) :basedisplay(scr.getBaseDisplay()),
-  screen(scr), window(win)
-{
   event.type = ClientMessage;
-  event.xclient.message_type = basedisplay.getOpenboxStructureMessagesAtom();
-  event.xclient.display = basedisplay.getXDisplay();
+  event.xclient.message_type =
+    blackbox->getBlackboxStructureMessagesAtom();
+  event.xclient.display = blackbox->getXDisplay();
   event.xclient.window = window;
   event.xclient.format = 32;
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyStartupAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyStartupAtom();
   event.xclient.data.l[1] = event.xclient.data.l[2] =
     event.xclient.data.l[3] = event.xclient.data.l[4] = 0l;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendWorkspaceCount(void) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWorkspaceCountAtom();
-  event.xclient.data.l[1] = screen.getWorkspaceCount();
+  event.xclient.data.l[0] =
+    blackbox->getBlackboxNotifyWorkspaceCountAtom();
+  event.xclient.data.l[1] = screen->getWorkspaceCount();
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendCurrentWorkspace(void) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyCurrentWorkspaceAtom();
-  event.xclient.data.l[1] = screen.getCurrentWorkspaceID();
+  event.xclient.data.l[0] =
+    blackbox->getBlackboxNotifyCurrentWorkspaceAtom();
+  event.xclient.data.l[1] = screen->getCurrentWorkspaceID();
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendWindowFocus(Window w) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWindowFocusAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyWindowFocusAtom();
   event.xclient.data.l[1] = w;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendWindowAdd(Window w, unsigned long p) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWindowAddAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyWindowAddAtom();
   event.xclient.data.l[1] = w;
   event.xclient.data.l[2] = p;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 
   event.xclient.data.l[2] = 0l;
 }
 
 
 void Netizen::sendWindowDel(Window w) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWindowDelAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyWindowDelAtom();
   event.xclient.data.l[1] = w;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendWindowRaise(Window w) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWindowRaiseAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyWindowRaiseAtom();
   event.xclient.data.l[1] = w;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendWindowLower(Window w) {
-  event.xclient.data.l[0] = basedisplay.getOpenboxNotifyWindowLowerAtom();
+  event.xclient.data.l[0] = blackbox->getBlackboxNotifyWindowLowerAtom();
   event.xclient.data.l[1] = w;
 
-  XSendEvent(basedisplay.getXDisplay(), window, False, NoEventMask, &event);
+  XSendEvent(blackbox->getXDisplay(), window, False, NoEventMask, &event);
 }
 
 
 void Netizen::sendConfigNotify(XEvent *e) {
-  XSendEvent(basedisplay.getXDisplay(), window, False,
+  XSendEvent(blackbox->getXDisplay(), window, False,
              StructureNotifyMask, e);
 }