aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-06 21:17:13 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:46 (GMT)
commit2073ae12a4e633d18f49559111131fffbc495dbd (patch)
tree66d42e79fc90f58ddb38fa105e4cc68b63362cb5 /src/Window.hh
parentff49160b120edd8d9396f10dab5a97bace8724ec (diff)
downloadfluxbox_pavel-2073ae12a4e633d18f49559111131fffbc495dbd.zip
fluxbox_pavel-2073ae12a4e633d18f49559111131fffbc495dbd.tar.bz2
Convert FbWinFrame::frameExtentSig to FbTk::Signal
Also, I spotted a potential bug in the code. I marked the place with XXX. Someone should take a look at that.
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 966631d..4ecfe05 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -33,8 +33,6 @@
33 33
34#include "FbTk/DefaultValue.hh" 34#include "FbTk/DefaultValue.hh"
35#include "FbTk/Timer.hh" 35#include "FbTk/Timer.hh"
36#include "FbTk/Subject.hh"
37#include "FbTk/Observer.hh"
38#include "FbTk/EventHandler.hh" 36#include "FbTk/EventHandler.hh"
39#include "FbTk/LayerItem.hh" 37#include "FbTk/LayerItem.hh"
40#include "FbTk/Signal.hh" 38#include "FbTk/Signal.hh"
@@ -58,7 +56,7 @@ class Layer;
58} 56}
59 57
60/// Creates the window frame and handles any window event for it 58/// Creates the window frame and handles any window event for it
61class FluxboxWindow: public Focusable, public FbTk::Observer, 59class FluxboxWindow: public Focusable,
62 public FbTk::EventHandler, 60 public FbTk::EventHandler,
63 private FbTk::SignalTracker { 61 private FbTk::SignalTracker {
64public: 62public:
@@ -466,15 +464,6 @@ public:
466 464
467 //@} 465 //@}
468 466
469 class WinSubject: public FbTk::Subject {
470 public:
471 WinSubject(FluxboxWindow &w):m_win(w) { }
472 FluxboxWindow &win() { return m_win; }
473 const FluxboxWindow &win() const { return m_win; }
474 private:
475 FluxboxWindow &m_win;
476 };
477
478 bool oplock; ///< Used to help stop transient loops occurring by locking a window during certain operations 467 bool oplock; ///< Used to help stop transient loops occurring by locking a window during certain operations
479 468
480private: 469private:
@@ -534,6 +523,7 @@ private:
534 void focusedWindowChanged(BScreen &screen, FluxboxWindow *focused_win, WinClient* client); 523 void focusedWindowChanged(BScreen &screen, FluxboxWindow *focused_win, WinClient* client);
535 /// Called when workspace area on screen changed. 524 /// Called when workspace area on screen changed.
536 void workspaceAreaChanged(BScreen &screen); 525 void workspaceAreaChanged(BScreen &screen);
526 void frameExtentChanged();
537 527
538 528
539 // state and hint signals 529 // state and hint signals