From c89591388be97519732c8d0738c9501db0957afd Mon Sep 17 00:00:00 2001 From: fluxgen Date: Sat, 7 Sep 2002 20:25:39 +0000 Subject: added AtomHandler, fixed observer and removed gnome stuff --- src/fluxbox.cc | 209 +++++++++++++++++++++++++++++++-------------------------- src/fluxbox.hh | 59 +++++++++------- 2 files changed, 149 insertions(+), 119 deletions(-) diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 01e2c3f..345cde8 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.73 2002/08/30 14:07:38 fluxgen Exp $ +// $Id: fluxbox.cc,v 1.74 2002/09/07 20:25:39 fluxgen Exp $ #include "fluxbox.hh" @@ -39,6 +39,10 @@ #include "StringUtil.hh" #include "Resource.hh" #include "XrmDatabaseHelper.hh" +#include "AtomHandler.hh" +#include "Gnome.hh" +//#include "Ewmh.hh" + #ifdef SLIT #include "Slit.hh" #endif // SLIT @@ -118,6 +122,7 @@ #include #include #include +#include using namespace std; using namespace FbTk; @@ -336,6 +341,10 @@ key(0) cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur); cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle); cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle); + + // setup atom handlers + m_atomhandler.push_back(new Gnome()); +// m_atomhandler.push_back(new Ewmh()); // TODO //singleton pointer singleton = this; @@ -376,11 +385,20 @@ key(0) sprintf(scrname, "session.screen%d", i); sprintf(altscrname, "session.Screen%d", i); BScreen *screen = new BScreen(m_screen_rm, this, scrname, altscrname, i); - if (! screen->isScreenManaged()) { - delete screen; + delete screen; continue; } + // attach screen signals to this + screen->currentWorkspaceSig().attach(this); + screen->workspaceCountSig().attach(this); + screen->workspaceNamesSig().attach(this); + screen->clientListSig().attach(this); + + // initiate atomhandler for screen specific stuff + for (size_t atomh=0; atomhinitForScreen(*screen); + } screenList.push_back(screen); } @@ -411,7 +429,13 @@ key(0) } -Fluxbox::~Fluxbox(void) { +Fluxbox::~Fluxbox() { + // destroy atomhandlers + while (!m_atomhandler.empty()) { + delete m_atomhandler.back(); + m_atomhandler.pop_back(); + } + std::list::iterator it = menuTimestamps.begin(); std::list::iterator it_end = menuTimestamps.end(); for (; it != it_end; ++it) { @@ -645,7 +669,10 @@ void Fluxbox::handleEvent(XEvent * const e) { win = new FluxboxWindow(e->xmaprequest.window); if (!win->isManaged()) { delete win; - win = 0; + win = 0; + } else { + // attach signals + attachSignals(*win); } } @@ -884,9 +911,9 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) { FluxboxWindow *win = (FluxboxWindow *) 0; Basemenu *menu = (Basemenu *) 0; - #ifdef SLIT +#ifdef SLIT Slit *slit = (Slit *) 0; - #endif // SLIT +#endif // SLIT Toolbar *tbar = (Toolbar *) 0; Tab *tab = 0; @@ -901,10 +928,10 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) { } else if ((menu = searchMenu(be.window))) { menu->buttonPressEvent(&be); - #ifdef SLIT +#ifdef SLIT } else if ((slit = searchSlit(be.window))) { slit->buttonPressEvent(&be); - #endif // SLIT +#endif // SLIT } else if ((tbar = searchToolbar(be.window))) { tbar->buttonPressEvent(&be); @@ -1107,17 +1134,12 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) { win->changeBlackboxHints(&net); } } else { - bool val = false; - #ifdef GNOME - val = checkGnomeAtoms(ce); - #endif //!GNOME - - #ifdef NEWWMSPEC - if (!val) - val = checkNETWMAtoms(ce); - #endif //!NEWWMSPEC - //disable `unused`-warning - val = true; + FluxboxWindow *win = searchWindow(ce.window); + BScreen *screen = searchScreen(ce.window); + + for (size_t i=0; icheckClientMessage(ce, screen, win); + } } } //----------- handleKeyEvent --------------- @@ -1531,80 +1553,6 @@ void Fluxbox::doWindowAction(Keys::KeyAction action, const int param) { } } -#ifdef GNOME -//---------------- checkGnomeAtoms --------------- -// Tries to find Gnome atoms in message -// Returns true on success else false -//--------------------------------------------- -bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) { - BScreen *screen = 0; - FluxboxWindow *win = 0; - win = searchWindow(ce.window); - screen = searchScreen(ce.window); - - if (ce.message_type == getGnomeWorkspaceAtom()) { -#ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<getScreen() && ce.data.l[0] >= 0 && - ce.data.l[0] < (signed)win->getScreen()->getCount()) { - win->getScreen()->changeWorkspaceID(ce.data.l[0]); - - } else if (screen!=0 && //the message sent to root window? - ce.data.l[0] >= 0 && - ce.data.l[0] < (signed)screen->getCount()) - screen->changeWorkspaceID(ce.data.l[0]); - return true; - } else if (win) { - if (ce.message_type == getGnomeStateAtom()) { -#ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_STATE"<setGnomeState(flag); - - } else if (ce.message_type == getGnomeHintsAtom()) { -#ifdef DEBUG - cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_HINTS"<= 0 && - ce.data.l[0] < screen->getCount()) - screen->changeWorkspaceID(ce.data.l[0]); - } else return false; - - return true; -} -#endif //!NEWWMSPEC void Fluxbox::handleEvent(SignalEvent * const sig) { I18n *i18n = I18n::instance(); @@ -1655,9 +1603,80 @@ void Fluxbox::handleEvent(SignalEvent * const sig) { abort(); break; } +} - +void Fluxbox::update(FbTk::Subject *changedsub) { + + if (typeid(*changedsub) == typeid(FluxboxWindow)) { + FluxboxWindow::WinSubject *winsub = dynamic_cast(changedsub); + FluxboxWindow &win = winsub->win(); + if ((&(win.hintSig())) == changedsub) { // hint signal +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<") hint signal from "<<&win<update()) + m_atomhandler[i]->updateHints(&win); + } + } else if ((&(win.stateSig())) == changedsub) { // state signal +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<") state signal from "<<&win<update()) + m_atomhandler[i]->updateState(&win); + } + } else if ((&(win.workspaceSig())) == changedsub) { // workspace signal +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<") workspace signal from "<<&win<(changedsub); + BScreen &screen = subj->screen(); + if ((&(screen.workspaceCountSig())) == changedsub) { +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<"): workspace count signal"<update()) + m_atomhandler[i]->updateWorkspaceCount(screen); + } + } else if ((&(screen.workspaceNamesSig())) == changedsub) { +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<"): workspace names signal"<update()) + m_atomhandler[i]->updateWorkspaceNames(screen); + } + } else if ((&(screen.currentWorkspaceSig())) == changedsub) { +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<"): current workspace signal"<update()) + m_atomhandler[i]->updateCurrentWorkspace(screen); + } + } else if ((&(screen.clientListSig())) == changedsub) { +#ifdef DEBUG + cerr<<__FILE__<<"("<<__LINE__<<"): client list signal"<update()) + m_atomhandler[i]->updateClientList(screen); + } + } + } +} + +void Fluxbox::attachSignals(FluxboxWindow &win) { + win.hintSig().attach(this); + win.stateSig().attach(this); + win.workspaceSig().attach(this); } diff --git a/src/fluxbox.hh b/src/fluxbox.hh index e877805..9d68be3 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.hh,v 1.27 2002/08/17 22:13:00 fluxgen Exp $ +// $Id: fluxbox.hh,v 1.28 2002/09/07 20:24:06 fluxgen Exp $ #ifndef FLUXBOX_HH #define FLUXBOX_HH @@ -35,6 +35,7 @@ #include "Window.hh" #include "Tab.hh" #include "Toolbar.hh" +#include "Observer.hh" #ifdef SLIT #include "Slit.hh" @@ -64,13 +65,17 @@ #include #include +class AtomHandler; + + /** main class for the window manager. singleton type */ class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::EventHandler, - public FbAtoms { + public FbAtoms, + public FbTk::Observer { public: Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); virtual ~Fluxbox(); @@ -153,6 +158,9 @@ public: /// handle any system signal sent to the application void handleEvent(FbTk::SignalEvent * const signum); + void update(FbTk::Subject *changed); + + void attachSignals(FluxboxWindow &win); virtual void timeout(); @@ -161,6 +169,7 @@ public: inline const Cursor &getLowerLeftAngleCursor() const { return cursor.ll_angle; } inline const Cursor &getLowerRightAngleCursor() const { return cursor.lr_angle; } + #ifdef SLIT Slit *searchSlit(Window); @@ -181,18 +190,6 @@ private: Cursor session, move, ll_angle, lr_angle; } cursor; - void setupConfigFiles(); - void handleButtonEvent(XButtonEvent &be); - void handleUnmapNotify(XUnmapEvent &ue); - void handleClientMessage(XClientMessageEvent &ce); - void handleKeyEvent(XKeyEvent &ke); - void doWindowAction(Keys::KeyAction action, const int param); - #ifdef GNOME - bool checkGnomeAtoms(XClientMessageEvent &ce); - #endif - #ifdef NEWWMSPEC - bool checkNETWMAtoms(XClientMessageEvent &ce); - #endif typedef struct MenuTimestamp { char *filename; time_t timestamp; @@ -203,6 +200,29 @@ private: timeval auto_raise_delay; } resource; + + std::string getRcFilename(); + void getDefaultDataFilename(char *, std::string &); + void load_rc(); + + void reload_rc(); + void real_rereadMenu(); + void real_reconfigure(); + + void handleEvent(XEvent *xe); + + void setupConfigFiles(); + void handleButtonEvent(XButtonEvent &be); + void handleUnmapNotify(XUnmapEvent &ue); + void handleClientMessage(XClientMessageEvent &ce); + void handleKeyEvent(XKeyEvent &ke); + void doWindowAction(Keys::KeyAction action, const int param); + + #ifdef NEWWMSPEC + bool checkNETWMAtoms(XClientMessageEvent &ce); + #endif + + ResourceManager m_resourcemanager, m_screen_rm; //--- Resources @@ -254,18 +274,9 @@ private: std::string slitlist_path; //default arguments for titlebar left and right static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; - - std::string getRcFilename(); - void getDefaultDataFilename(char *, std::string &); - void load_rc(); - void reload_rc(); - void real_rereadMenu(); - void real_reconfigure(); - - void handleEvent(XEvent *xe); static Fluxbox *singleton; - + std::vector m_atomhandler; }; -- cgit v0.11.2