diff options
Diffstat (limited to 'src/Slit.hh')
-rw-r--r-- | src/Slit.hh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/Slit.hh b/src/Slit.hh index a9c3322..f2e74bb 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.26 2003/05/07 22:53:21 fluxgen Exp $ | 25 | /// $Id: Slit.hh,v 1.27 2003/05/11 17:42:51 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SLIT_HH | 27 | #ifndef SLIT_HH |
28 | #define SLIT_HH | 28 | #define SLIT_HH |
@@ -61,16 +61,16 @@ public: | |||
61 | Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); | 61 | Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); |
62 | virtual ~Slit(); | 62 | virtual ~Slit(); |
63 | 63 | ||
64 | inline bool isHidden() const { return hidden; } | 64 | inline bool isHidden() const { return m_hidden; } |
65 | inline bool doAutoHide() const { return do_auto_hide; } | 65 | inline bool doAutoHide() const { return m_do_auto_hide; } |
66 | inline Direction direction() const { return m_direction; } | 66 | inline Direction direction() const { return m_direction; } |
67 | inline Placement placement() const { return m_placement; } | 67 | inline Placement placement() const { return m_placement; } |
68 | FbTk::Menu &menu() { return slitmenu; } | 68 | FbTk::Menu &menu() { return m_slitmenu; } |
69 | 69 | ||
70 | inline const FbTk::FbWindow &window() const { return frame.window; } | 70 | inline const FbTk::FbWindow &window() const { return frame.window; } |
71 | 71 | ||
72 | inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); } | 72 | inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); } |
73 | inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); } | 73 | inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); } |
74 | 74 | ||
75 | inline unsigned int width() const { return frame.width; } | 75 | inline unsigned int width() const { return frame.width; } |
76 | inline unsigned int height() const { return frame.height; } | 76 | inline unsigned int height() const { return frame.height; } |
@@ -117,18 +117,18 @@ private: | |||
117 | void loadClientList(const char *filename); | 117 | void loadClientList(const char *filename); |
118 | void updateClientmenu(); | 118 | void updateClientmenu(); |
119 | 119 | ||
120 | bool hidden, do_auto_hide; | 120 | bool m_hidden, m_do_auto_hide; |
121 | Direction m_direction; | 121 | Direction m_direction; |
122 | Placement m_placement; | 122 | Placement m_placement; |
123 | 123 | ||
124 | BScreen &m_screen; | 124 | BScreen &m_screen; |
125 | FbTk::Timer timer; | 125 | FbTk::Timer m_timer; |
126 | 126 | ||
127 | typedef std::list<SlitClient *> SlitClients; | 127 | typedef std::list<SlitClient *> SlitClients; |
128 | 128 | ||
129 | SlitClients clientList; | 129 | SlitClients m_client_list; |
130 | FbMenu slitmenu, placement_menu, clientlist_menu; | 130 | FbMenu m_slitmenu, m_placement_menu, m_clientlist_menu; |
131 | std::auto_ptr<LayerMenu<Slit> > m_slit_layermenu; | 131 | std::auto_ptr<LayerMenu<Slit> > m_layermenu; |
132 | std::string m_filename; | 132 | std::string m_filename; |
133 | 133 | ||
134 | struct frame { | 134 | struct frame { |
@@ -138,8 +138,9 @@ private: | |||
138 | int x, y, x_hidden, y_hidden; | 138 | int x, y, x_hidden, y_hidden; |
139 | unsigned int width, height; | 139 | unsigned int width, height; |
140 | } frame; | 140 | } frame; |
141 | |||
141 | // for KDE | 142 | // for KDE |
142 | Atom kwm1_dockwindow, kwm2_dockwindow; | 143 | Atom m_kwm1_dockwindow, m_kwm2_dockwindow; |
143 | 144 | ||
144 | std::auto_ptr<FbTk::XLayerItem> m_layeritem; | 145 | std::auto_ptr<FbTk::XLayerItem> m_layeritem; |
145 | std::auto_ptr<SlitTheme> m_slit_theme; | 146 | std::auto_ptr<SlitTheme> m_slit_theme; |