aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-27 20:29:35 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-27 20:29:35 (GMT)
commita2ec0c9bdd9ebcc713426a79209b9ca90b4db301 (patch)
tree3d7b659c38f3b01e4e09a4887dc7b7cf1f73689b /src/Window.hh
parent84c87a86f9365014b7425c56a2a1051c102df804 (diff)
downloadfluxbox_pavel-a2ec0c9bdd9ebcc713426a79209b9ca90b4db301.zip
fluxbox_pavel-a2ec0c9bdd9ebcc713426a79209b9ca90b4db301.tar.bz2
make FbWinFrame and FluxboxWindow share a WindowState object
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 2dbb816..b0b8248 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -371,12 +371,12 @@ public:
371 bool isManaged() const { return m_initialized; } 371 bool isManaged() const { return m_initialized; }
372 bool isVisible() const; 372 bool isVisible() const;
373 bool isIconic() const { return iconic; } 373 bool isIconic() const { return iconic; }
374 bool isShaded() const { return shaded; } 374 bool isShaded() const { return m_state.shaded; }
375 bool isFullscreen() const { return fullscreen; } 375 bool isFullscreen() const { return m_state.fullscreen; }
376 bool isMaximized() const { return maximized == WindowState::MAX_FULL; } 376 bool isMaximized() const { return m_state.isMaximized(); }
377 bool isMaximizedVert() const { return (bool)(maximized & WindowState::MAX_VERT); } 377 bool isMaximizedVert() const { return m_state.isMaximizedVert(); }
378 bool isMaximizedHorz() const { return (bool)(maximized & WindowState::MAX_HORZ); } 378 bool isMaximizedHorz() const { return m_state.isMaximizedHorz(); }
379 int maximizedState() const { return maximized; } 379 int maximizedState() const { return m_state.maximized; }
380 bool isIconifiable() const { return functions.iconify; } 380 bool isIconifiable() const { return functions.iconify; }
381 bool isMaximizable() const { return functions.maximize; } 381 bool isMaximizable() const { return functions.maximize; }
382 bool isResizable() const { return functions.resize; } 382 bool isResizable() const { return functions.resize; }
@@ -425,6 +425,11 @@ public:
425 unsigned int width() const { return frame().width(); } 425 unsigned int width() const { return frame().width(); }
426 unsigned int height() const { return frame().height(); } 426 unsigned int height() const { return frame().height(); }
427 427
428 int normalX() const { return m_state.x; }
429 int normalY() const { return m_state.y; }
430 unsigned int normalWidth() const { return m_state.width; }
431 unsigned int normalHeight() const { return m_state.height; }
432
428 int xOffset() const { return frame().xOffset(); } 433 int xOffset() const { return frame().xOffset(); }
429 int yOffset() const { return frame().yOffset(); } 434 int yOffset() const { return frame().yOffset(); }
430 int widthOffset() const { return frame().widthOffset(); } 435 int widthOffset() const { return frame().widthOffset(); }
@@ -526,10 +531,7 @@ private:
526 time_t m_creation_time; 531 time_t m_creation_time;
527 532
528 // Window states 533 // Window states
529 bool moving, resizing, shaded, iconic, 534 bool moving, resizing, iconic, stuck, m_initialized;
530 stuck, m_initialized, fullscreen;
531
532 int maximized;
533 535
534 WinClient *m_attaching_tab; 536 WinClient *m_attaching_tab;
535 537
@@ -579,7 +581,9 @@ private:
579 581
580 FocusableTheme<WinButtonTheme> m_button_theme; 582 FocusableTheme<WinButtonTheme> m_button_theme;
581 FocusableTheme<FbWinFrameTheme> m_theme; 583 FocusableTheme<FbWinFrameTheme> m_theme;
582 FbWinFrame m_frame; ///< the actuall window frame 584
585 WindowState m_state;
586 FbWinFrame m_frame; ///< the actual window frame
583 587
584 bool m_placed; ///< determine whether or not we should place the window 588 bool m_placed; ///< determine whether or not we should place the window
585 589