diff options
author | fluxgen <fluxgen> | 2003-04-25 16:55:39 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-25 16:55:39 (GMT) |
commit | 278b562d1df988f733e41231c6784959b767c502 (patch) | |
tree | 39ed4d3a206ccadce661db35677c4af4bc3c5029 | |
parent | 834abda73cee89f300567b815d4b53ea2042ab9f (diff) | |
download | fluxbox_lack-278b562d1df988f733e41231c6784959b767c502.zip fluxbox_lack-278b562d1df988f733e41231c6784959b767c502.tar.bz2 |
minor cleaning
-rw-r--r-- | src/Slit.hh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Slit.hh b/src/Slit.hh index f335e34..74f69f9 100644 --- a/src/Slit.hh +++ b/src/Slit.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | /// $Id: Slit.hh,v 1.23 2003/04/25 10:45:02 fluxgen Exp $ | 25 | /// $Id: Slit.hh,v 1.24 2003/04/25 16:55:39 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SLIT_HH | 27 | #ifndef SLIT_HH |
28 | #define SLIT_HH | 28 | #define SLIT_HH |
@@ -32,7 +32,6 @@ | |||
32 | #include "Timer.hh" | 32 | #include "Timer.hh" |
33 | #include "XLayerItem.hh" | 33 | #include "XLayerItem.hh" |
34 | #include "LayerMenu.hh" | 34 | #include "LayerMenu.hh" |
35 | #include "fluxbox.hh" | ||
36 | 35 | ||
37 | #include <X11/Xlib.h> | 36 | #include <X11/Xlib.h> |
38 | #include <X11/Xutil.h> | 37 | #include <X11/Xutil.h> |
@@ -54,12 +53,11 @@ public: | |||
54 | */ | 53 | */ |
55 | enum Direction { VERTICAL = 1, HORIZONTAL }; | 54 | enum Direction { VERTICAL = 1, HORIZONTAL }; |
56 | /** | 55 | /** |
57 | Screen placement | 56 | Placement on screen |
58 | */ | 57 | */ |
59 | enum Placement { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER, | 58 | enum Placement { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER, |
60 | TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT }; | 59 | TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT }; |
61 | 60 | Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); | |
62 | explicit Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); | ||
63 | virtual ~Slit(); | 61 | virtual ~Slit(); |
64 | 62 | ||
65 | inline bool isHidden() const { return hidden; } | 63 | inline bool isHidden() const { return hidden; } |
@@ -68,7 +66,7 @@ public: | |||
68 | inline Placement placement() const { return m_placement; } | 66 | inline Placement placement() const { return m_placement; } |
69 | FbTk::Menu &menu() { return slitmenu; } | 67 | FbTk::Menu &menu() { return slitmenu; } |
70 | 68 | ||
71 | inline Window getWindowID() const { return frame.window.window(); } | 69 | inline const FbTk::FbWindow &window() const { return frame.window; } |
72 | 70 | ||
73 | inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); } | 71 | inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); } |
74 | inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); } | 72 | inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); } |
@@ -80,7 +78,7 @@ public: | |||
80 | void setPlacement(Placement place); | 78 | void setPlacement(Placement place); |
81 | void setAutoHide(bool val); | 79 | void setAutoHide(bool val); |
82 | void addClient(Window clientwin); | 80 | void addClient(Window clientwin); |
83 | void removeClient(Window clientwin, bool = true); | 81 | void removeClient(Window clientwin, bool remap = true); |
84 | void reconfigure(); | 82 | void reconfigure(); |
85 | void reposition(); | 83 | void reposition(); |
86 | void shutdown(); | 84 | void shutdown(); |
@@ -128,8 +126,7 @@ private: | |||
128 | 126 | ||
129 | SlitClients clientList; | 127 | SlitClients clientList; |
130 | FbTk::Menu slitmenu, placement_menu, clientlist_menu; | 128 | FbTk::Menu slitmenu, placement_menu, clientlist_menu; |
131 | std::auto_ptr<LayerMenu<Slit> > slit_layermenu; | 129 | std::auto_ptr<LayerMenu<Slit> > m_slit_layermenu; |
132 | std::string clientListPath; | ||
133 | std::string m_filename; | 130 | std::string m_filename; |
134 | 131 | ||
135 | struct frame { | 132 | struct frame { |