nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change to singleton fbatoms

Browse source
This commit is contained in:
fluxgen 2002-08-14 21:59:28 +00:00
parent 238526bd48
commit ab4fef4450
2 changed files with 41 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/Netizen.cc
View file

@ -19,8 +19,11 @@
// 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
#include "Netizen.hh"
#include "Screen.hh"
// use GNU extensions
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif // _GNU_SOURCE
@ -29,92 +32,85 @@
#include "../config.h"
#endif // HAVE_CONFIG_H
#include "Netizen.hh"
Netizen::Netizen(BScreen *scr, Window win):
screen(scr),
basedisplay(scr->getBaseDisplay()),
m_display(scr->getBaseDisplay()->getXDisplay()),
window(win) {
screen = scr;
basedisplay = screen->getBaseDisplay();
window = win;
event.type = ClientMessage;
event.xclient.message_type = basedisplay->getFluxboxStructureMessagesAtom();
event.xclient.display = basedisplay->getXDisplay();
event.xclient.message_type = FbAtoms::instance()->getFluxboxStructureMessagesAtom();
event.xclient.display = m_display;
event.xclient.window = window;
event.xclient.format = 32;
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyStartupAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyStartupAtom();
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(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendWorkspaceCount(void) {
void Netizen::sendWorkspaceCount() {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWorkspaceCountAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWorkspaceCountAtom();
event.xclient.data.l[1] = screen->getCount();
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendCurrentWorkspace(void) {
void Netizen::sendCurrentWorkspace() {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyCurrentWorkspaceAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyCurrentWorkspaceAtom();
event.xclient.data.l[1] = screen->getCurrentWorkspaceID();
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendWindowFocus(Window w) {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWindowFocusAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowFocusAtom();
event.xclient.data.l[1] = w;
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendWindowAdd(Window w, unsigned long p) {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWindowAddAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowAddAtom();
event.xclient.data.l[1] = w;
event.xclient.data.l[2] = p;
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
event.xclient.data.l[2] = 0l;
}
void Netizen::sendWindowDel(Window w) {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWindowDelAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowDelAtom();
event.xclient.data.l[1] = w;
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendWindowRaise(Window w) {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWindowRaiseAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowRaiseAtom();
event.xclient.data.l[1] = w;
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendWindowLower(Window w) {
event.xclient.data.l[0] = basedisplay->getFluxboxNotifyWindowLowerAtom();
event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowLowerAtom();
event.xclient.data.l[1] = w;
XSendEvent(basedisplay->getXDisplay(), window, False, NoEventMask, &event);
XSendEvent(m_display, window, False, NoEventMask, &event);
}
void Netizen::sendConfigNotify(XEvent *e) {
XSendEvent(basedisplay->getXDisplay(), window, False,
StructureNotifyMask, e);
XSendEvent(m_display, window, False, StructureNotifyMask, e);
}

31
src/Netizen.hh
View file

@ -1,3 +1,5 @@
// Netizen.hh for Fluxbox
// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// Netizen.hh for Blackbox - An X11 Window Manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
//
@ -22,34 +24,29 @@
#ifndef NETIZEN_HH
#define NETIZEN_HH
// forward declaration
class Netizen;
#include <X11/Xlib.h>
#include "BaseDisplay.hh"
#include "Screen.hh"
class BScreen;
class Netizen {
public:
Netizen(BScreen *, Window);
Netizen(BScreen *scr, Window w);
inline const Window &getWindowID(void) const { return window; }
inline Window getWindowID() const { return window; }
void sendWorkspaceCount(void);
void sendCurrentWorkspace(void);
void sendWorkspaceCount();
void sendCurrentWorkspace();
void sendWindowFocus(Window);
void sendWindowAdd(Window, unsigned long);
void sendWindowDel(Window);
void sendWindowRaise(Window);
void sendWindowLower(Window);
void sendWindowFocus(Window w);
void sendWindowAdd(Window w, unsigned long p);
void sendWindowDel(Window w);
void sendWindowRaise(Window w);
void sendWindowLower(Window w);
void sendConfigNotify(XEvent *);
void sendConfigNotify(XEvent *xe);
private:
BScreen *screen;
BaseDisplay *basedisplay;
Display *m_display; ///< display connection
Window window;
XEvent event;