diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.hh | 10 | ||||
-rw-r--r-- | src/Window.cc | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 0b606a8..8f5951e 100644 --- a/src/Screen.hh +++ b/src/Screen.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: Screen.hh,v 1.132 2004/01/11 16:05:55 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.133 2004/01/16 11:58:45 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -253,6 +253,7 @@ public: | |||
253 | void shutdown(); | 253 | void shutdown(); |
254 | /// show position window centered on the screen with "X x Y" text | 254 | /// show position window centered on the screen with "X x Y" text |
255 | void showPosition(int x, int y); | 255 | void showPosition(int x, int y); |
256 | void hidePosition(); | ||
256 | /// show geomentry with "width x height"-text, not size of window | 257 | /// show geomentry with "width x height"-text, not size of window |
257 | void showGeometry(unsigned int width, unsigned int height); | 258 | void showGeometry(unsigned int width, unsigned int height); |
258 | void hideGeometry(); | 259 | void hideGeometry(); |
@@ -351,6 +352,7 @@ private: | |||
351 | bool doSkipWindow(const WinClient &winclient, int options); | 352 | bool doSkipWindow(const WinClient &winclient, int options); |
352 | 353 | ||
353 | void renderGeomWindow(); | 354 | void renderGeomWindow(); |
355 | void renderPosWindow(); | ||
354 | void updateIconMenu(); | 356 | void updateIconMenu(); |
355 | 357 | ||
356 | ScreenSubject | 358 | ScreenSubject |
@@ -364,11 +366,11 @@ private: | |||
364 | 366 | ||
365 | FbTk::MultLayers m_layermanager; | 367 | FbTk::MultLayers m_layermanager; |
366 | 368 | ||
367 | bool root_colormap_installed, managed, geom_visible, cycling_focus; | 369 | bool root_colormap_installed, managed, geom_visible, pos_visible, cycling_focus; |
368 | GC opGC; | 370 | GC opGC; |
369 | Pixmap geom_pixmap; | 371 | Pixmap geom_pixmap, pos_pixmap; |
370 | 372 | ||
371 | FbTk::FbWindow m_geom_window; | 373 | FbTk::FbWindow m_geom_window, m_pos_window; |
372 | 374 | ||
373 | std::auto_ptr<FbTk::ImageControl> m_image_control; | 375 | std::auto_ptr<FbTk::ImageControl> m_image_control; |
374 | std::auto_ptr<FbTk::Menu> m_configmenu; | 376 | std::auto_ptr<FbTk::Menu> m_configmenu; |
diff --git a/src/Window.cc b/src/Window.cc index bb44b50..5f024bd 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -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: Window.cc,v 1.260 2004/01/16 11:41:38 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.261 2004/01/16 11:58:45 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -294,6 +294,7 @@ FluxboxWindow::~FluxboxWindow() { | |||
294 | 294 | ||
295 | if (moving || resizing || m_attaching_tab) { | 295 | if (moving || resizing || m_attaching_tab) { |
296 | screen().hideGeometry(); | 296 | screen().hideGeometry(); |
297 | screen().hidePosition(); | ||
297 | XUngrabPointer(display, CurrentTime); | 298 | XUngrabPointer(display, CurrentTime); |
298 | } | 299 | } |
299 | 300 | ||
@@ -2811,7 +2812,7 @@ void FluxboxWindow::stopMoving() { | |||
2811 | } | 2812 | } |
2812 | 2813 | ||
2813 | 2814 | ||
2814 | screen().hideGeometry(); | 2815 | screen().hidePosition(); |
2815 | XUngrabPointer(display, CurrentTime); | 2816 | XUngrabPointer(display, CurrentTime); |
2816 | 2817 | ||
2817 | FbTk::App::instance()->sync(false); //make sure the redraw is made before we continue | 2818 | FbTk::App::instance()->sync(false); //make sure the redraw is made before we continue |