diff options
author | fluxgen <fluxgen> | 2003-08-16 12:12:21 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-16 12:12:21 (GMT) |
commit | e39e47b5cfe6b0e4fbdb850757c81f363ef2f38c (patch) | |
tree | 23b84d7e7519b4aeaef4b93b8a8ceeed0b7f07e8 | |
parent | a44683165c1c892dc6d83151323fa70780a920c0 (diff) | |
download | fluxbox-e39e47b5cfe6b0e4fbdb850757c81f363ef2f38c.zip fluxbox-e39e47b5cfe6b0e4fbdb850757c81f363ef2f38c.tar.bz2 |
minor cleaning
-rw-r--r-- | src/SystemTray.cc | 7 | ||||
-rw-r--r-- | src/SystemTray.hh | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/SystemTray.cc b/src/SystemTray.cc index 708f257..a90abd3 100644 --- a/src/SystemTray.cc +++ b/src/SystemTray.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: SystemTray.cc,v 1.1 2003/08/15 13:48:50 fluxgen Exp $ | 22 | // $Id: SystemTray.cc,v 1.2 2003/08/16 12:12:21 fluxgen Exp $ |
23 | 23 | ||
24 | #include "SystemTray.hh" | 24 | #include "SystemTray.hh" |
25 | 25 | ||
@@ -28,6 +28,8 @@ | |||
28 | #include "AtomHandler.hh" | 28 | #include "AtomHandler.hh" |
29 | #include "fluxbox.hh" | 29 | #include "fluxbox.hh" |
30 | 30 | ||
31 | #include <X11/Xutil.h> | ||
32 | |||
31 | #include <iostream> | 33 | #include <iostream> |
32 | #include <string> | 34 | #include <string> |
33 | 35 | ||
@@ -118,7 +120,6 @@ SystemTray::SystemTray(const FbTk::FbWindow &parent): | |||
118 | 120 | ||
119 | XSendEvent(disp, root_window, false, StructureNotifyMask, &ce); | 121 | XSendEvent(disp, root_window, false, StructureNotifyMask, &ce); |
120 | 122 | ||
121 | |||
122 | } | 123 | } |
123 | 124 | ||
124 | SystemTray::~SystemTray() { | 125 | SystemTray::~SystemTray() { |
@@ -265,7 +266,7 @@ void SystemTray::handleEvent(XEvent &event) { | |||
265 | } | 266 | } |
266 | 267 | ||
267 | void SystemTray::rearrangeClients() { | 268 | void SystemTray::rearrangeClients() { |
268 | // resize clients | 269 | // move and resize clients |
269 | ClientList::iterator client_it = m_clients.begin(); | 270 | ClientList::iterator client_it = m_clients.begin(); |
270 | ClientList::iterator client_it_end = m_clients.end(); | 271 | ClientList::iterator client_it_end = m_clients.end(); |
271 | int next_x = 0; | 272 | int next_x = 0; |
diff --git a/src/SystemTray.hh b/src/SystemTray.hh index 908738e..82d163c 100644 --- a/src/SystemTray.hh +++ b/src/SystemTray.hh | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: SystemTray.hh,v 1.1 2003/08/15 13:48:50 fluxgen Exp $ | 22 | // $Id: SystemTray.hh,v 1.2 2003/08/16 12:12:21 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef SYSTEMTRAY_HH | 24 | #ifndef SYSTEMTRAY_HH |
25 | #define SYSTEMTRAY_HH | 25 | #define SYSTEMTRAY_HH |
@@ -40,7 +40,7 @@ class SystemTray: public ToolbarItem, public FbTk::EventHandler { | |||
40 | public: | 40 | public: |
41 | 41 | ||
42 | explicit SystemTray(const FbTk::FbWindow &parent); | 42 | explicit SystemTray(const FbTk::FbWindow &parent); |
43 | ~SystemTray(); | 43 | virtual ~SystemTray(); |
44 | 44 | ||
45 | void move(int x, int y); | 45 | void move(int x, int y); |
46 | void resize(unsigned int width, unsigned int height); | 46 | void resize(unsigned int width, unsigned int height); |
@@ -57,6 +57,9 @@ public: | |||
57 | unsigned int height() const; | 57 | unsigned int height() const; |
58 | unsigned int borderWidth() const; | 58 | unsigned int borderWidth() const; |
59 | 59 | ||
60 | int numClients() const { return m_clients.size(); } | ||
61 | const FbTk::FbWindow &window() const { return m_window; } | ||
62 | |||
60 | private: | 63 | private: |
61 | typedef std::list<FbTk::FbWindow *> ClientList; | 64 | typedef std::list<FbTk::FbWindow *> ClientList; |
62 | ClientList::iterator findClient(Window win); | 65 | ClientList::iterator findClient(Window win); |