diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/FbWindow.cc | 22 | ||||
-rw-r--r-- | src/FbTk/FbWindow.hh | 26 |
2 files changed, 22 insertions, 26 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index a16fbb6..ba8a933 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.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: FbWindow.cc,v 1.28 2003/10/26 20:52:28 fluxgen Exp $ | 22 | // $Id: FbWindow.cc,v 1.29 2003/12/30 17:17:05 fluxgen Exp $ |
23 | 23 | ||
24 | #include "FbWindow.hh" | 24 | #include "FbWindow.hh" |
25 | 25 | ||
@@ -305,26 +305,6 @@ void FbWindow::hide() { | |||
305 | XUnmapWindow(s_display, m_window); | 305 | XUnmapWindow(s_display, m_window); |
306 | } | 306 | } |
307 | 307 | ||
308 | void FbWindow::move(int x, int y) { | ||
309 | XMoveWindow(s_display, m_window, x, y); | ||
310 | m_x = x; | ||
311 | m_y = y; | ||
312 | } | ||
313 | |||
314 | void FbWindow::resize(unsigned int width, unsigned int height) { | ||
315 | XResizeWindow(s_display, m_window, width, height); | ||
316 | m_width = width; | ||
317 | m_height = height; | ||
318 | } | ||
319 | |||
320 | void FbWindow::moveResize(int x, int y, unsigned int width, unsigned int height) { | ||
321 | XMoveResizeWindow(s_display, m_window, x, y, width, height); | ||
322 | m_x = x; | ||
323 | m_y = y; | ||
324 | m_width = width; | ||
325 | m_height = height; | ||
326 | } | ||
327 | |||
328 | void FbWindow::lower() { | 308 | void FbWindow::lower() { |
329 | XLowerWindow(s_display, window()); | 309 | XLowerWindow(s_display, window()); |
330 | } | 310 | } |
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh index 60acec4..499d3ad 100644 --- a/src/FbTk/FbWindow.hh +++ b/src/FbTk/FbWindow.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: FbWindow.hh,v 1.26 2003/12/16 17:06:49 fluxgen Exp $ | 22 | // $Id: FbWindow.hh,v 1.27 2003/12/30 17:17:05 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBTK_FBWINDOW_HH | 24 | #ifndef FBTK_FBWINDOW_HH |
25 | #define FBTK_FBWINDOW_HH | 25 | #define FBTK_FBWINDOW_HH |
@@ -91,9 +91,25 @@ public: | |||
91 | virtual void show(); | 91 | virtual void show(); |
92 | virtual void showSubwindows(); | 92 | virtual void showSubwindows(); |
93 | 93 | ||
94 | virtual void move(int x, int y); | 94 | virtual inline void move(int x, int y) { |
95 | virtual void resize(unsigned int width, unsigned int height); | 95 | XMoveWindow(s_display, m_window, x, y); |
96 | virtual void moveResize(int x, int y, unsigned int width, unsigned int height); | 96 | m_x = x; |
97 | m_y = y; | ||
98 | } | ||
99 | |||
100 | virtual inline void resize(unsigned int width, unsigned int height) { | ||
101 | XResizeWindow(s_display, m_window, width, height); | ||
102 | m_width = width; | ||
103 | m_height = height; | ||
104 | } | ||
105 | |||
106 | virtual inline void moveResize(int x, int y, unsigned int width, unsigned int height) { | ||
107 | XMoveResizeWindow(s_display, m_window, x, y, width, height); | ||
108 | m_x = x; | ||
109 | m_y = y; | ||
110 | m_width = width; | ||
111 | m_height = height; | ||
112 | } | ||
97 | virtual void lower(); | 113 | virtual void lower(); |
98 | virtual void raise(); | 114 | virtual void raise(); |
99 | void setInputFocus(int revert_to, int time); | 115 | void setInputFocus(int revert_to, int time); |
@@ -175,7 +191,7 @@ class ChangeProperty { | |||
175 | public: | 191 | public: |
176 | ChangeProperty(Display *disp, Atom prop, int mode, | 192 | ChangeProperty(Display *disp, Atom prop, int mode, |
177 | unsigned char *state, int num):m_disp(disp), | 193 | unsigned char *state, int num):m_disp(disp), |
178 | m_prop(prop), m_state(state), m_num(num), m_mode(mode){ | 194 | m_prop(prop), m_state(state), m_num(num), m_mode(mode){ |
179 | 195 | ||
180 | } | 196 | } |
181 | void operator () (FbTk::FbWindow *win) { | 197 | void operator () (FbTk::FbWindow *win) { |