diff options
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Window.hh b/src/Window.hh index 66c6f2b..032ea07 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #include "FbTk/Timer.hh" | 30 | #include "FbTk/Timer.hh" |
31 | #include "FbTk/Subject.hh" | 31 | #include "FbTk/Subject.hh" |
32 | #include "FbTk/Observer.hh" | ||
32 | #include "FbTk/EventHandler.hh" | 33 | #include "FbTk/EventHandler.hh" |
33 | #include "FbTk/XLayerItem.hh" | 34 | #include "FbTk/XLayerItem.hh" |
34 | #include "FbWinFrame.hh" | 35 | #include "FbWinFrame.hh" |
@@ -58,7 +59,8 @@ class Menu; | |||
58 | } | 59 | } |
59 | 60 | ||
60 | /// Creates the window frame and handles any window event for it | 61 | /// Creates the window frame and handles any window event for it |
61 | class FluxboxWindow: public Focusable, public FbTk::EventHandler { | 62 | class FluxboxWindow: public Focusable, public FbTk::Observer, |
63 | public FbTk::EventHandler { | ||
62 | public: | 64 | public: |
63 | /// Motif wm Hints | 65 | /// Motif wm Hints |
64 | enum { | 66 | enum { |
@@ -366,6 +368,9 @@ public: | |||
366 | void leaveNotifyEvent(XCrossingEvent &ev); | 368 | void leaveNotifyEvent(XCrossingEvent &ev); |
367 | //@} | 369 | //@} |
368 | 370 | ||
371 | /// handle Subject notifications | ||
372 | void update(FbTk::Subject *subj); | ||
373 | |||
369 | void applyDecorations(bool initial = false); | 374 | void applyDecorations(bool initial = false); |
370 | void toggleDecoration(); | 375 | void toggleDecoration(); |
371 | 376 | ||
@@ -536,9 +541,6 @@ private: | |||
536 | void attachTo(int x, int y, bool interrupted = false); | 541 | void attachTo(int x, int y, bool interrupted = false); |
537 | 542 | ||
538 | bool getState(); | 543 | bool getState(); |
539 | /// gets title string from client window and updates frame's title | ||
540 | void updateTitleFromClient(WinClient &client); | ||
541 | /// gets icon name from client window | ||
542 | void updateMWMHintsFromClient(WinClient &client); | 544 | void updateMWMHintsFromClient(WinClient &client); |
543 | void updateRememberStateFromClient(WinClient &client); | 545 | void updateRememberStateFromClient(WinClient &client); |
544 | void saveBlackboxAttribs(); | 546 | void saveBlackboxAttribs(); |
@@ -613,9 +615,6 @@ private: | |||
613 | typedef std::map<WinClient *, IconButton *> Client2ButtonMap; | 615 | typedef std::map<WinClient *, IconButton *> Client2ButtonMap; |
614 | Client2ButtonMap m_labelbuttons; | 616 | Client2ButtonMap m_labelbuttons; |
615 | 617 | ||
616 | // just temporary solution | ||
617 | friend class WinClient; | ||
618 | |||
619 | struct _decorations { | 618 | struct _decorations { |
620 | bool titlebar, handle, border, iconify, | 619 | bool titlebar, handle, border, iconify, |
621 | maximize, close, menu, sticky, shade, tab, enabled; | 620 | maximize, close, menu, sticky, shade, tab, enabled; |