X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FNetizen.cc;h=a50f5e0b82b831ad2ddcebf6f25356685a146521;hb=cbf4bb3d62df50045fd71920256865becae21990;hp=22d47958eb64adc7dc49a7c19e44cceb6d0df068;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/src/Netizen.cc b/src/Netizen.cc
index 22d47958..a50f5e0b 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,97 +21,97 @@
 // 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"
+#include "XAtom.hh"
 
 Netizen::Netizen(BScreen *scr, Window win) {
   screen = scr;
-  basedisplay = screen->getBaseDisplay();
+  blackbox = scr->getBlackbox();
+  xatom = blackbox->getXAtom();
   window = win;
 
   event.type = ClientMessage;
-  event.xclient.message_type = basedisplay->getOpenboxStructureMessagesAtom();
-  event.xclient.display = basedisplay->getXDisplay();
+  event.xclient.message_type =
+    xatom->getAtom(XAtom::blackbox_structure_messages);
+  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] = xatom->getAtom(XAtom::blackbox_notify_startup);
   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->getCount();
+  event.xclient.data.l[0] =
+    xatom->getAtom(XAtom::blackbox_notify_workspace_count);
+  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[0] =
+    xatom->getAtom(XAtom::blackbox_notify_current_workspace);
   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] = xatom->getAtom(XAtom::blackbox_notify_window_focus);
   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] = xatom->getAtom(XAtom::blackbox_notify_window_add);
   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] = xatom->getAtom(XAtom::blackbox_notify_window_del);
   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] = xatom->getAtom(XAtom::blackbox_notify_window_raise);
   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] =
+    xatom->getAtom(XAtom::blackbox_notify_window_lower);
   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);
 }