aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-27 22:29:33 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-27 22:29:33 (GMT)
commit82047e6a391a12be9583168f28ac72c1154108d6 (patch)
tree68cc4865da7bdf95052907c6d8ce9cf0fb19c90b /src/Window.hh
parenta2ec0c9bdd9ebcc713426a79209b9ca90b4db301 (diff)
downloadfluxbox_pavel-82047e6a391a12be9583168f28ac72c1154108d6.zip
fluxbox_pavel-82047e6a391a12be9583168f28ac72c1154108d6.tar.bz2
move some things from FluxboxWindow to WindowState
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/Window.hh b/src/Window.hh
index b0b8248..220cedb 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -122,7 +122,7 @@ public:
122 typedef std::list<WinClient *> ClientList; 122 typedef std::list<WinClient *> ClientList;
123 123
124 /// create a window from a client 124 /// create a window from a client
125 FluxboxWindow(WinClient &client, FbTk::XLayer &layer); 125 FluxboxWindow(WinClient &client);
126 126
127 virtual ~FluxboxWindow(); 127 virtual ~FluxboxWindow();
128 128
@@ -366,11 +366,11 @@ public:
366 void setMovable(bool movable) { functions.move = movable; } 366 void setMovable(bool movable) { functions.move = movable; }
367 void setResizable(bool resizable) { functions.resize = resizable; } 367 void setResizable(bool resizable) { functions.resize = resizable; }
368 368
369 bool isFocusHidden() const { return m_focus_hidden; } 369 bool isFocusHidden() const { return m_state.focus_hidden; }
370 bool isIconHidden() const { return m_icon_hidden; } 370 bool isIconHidden() const { return m_state.icon_hidden; }
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 m_state.iconic; }
374 bool isShaded() const { return m_state.shaded; } 374 bool isShaded() const { return m_state.shaded; }
375 bool isFullscreen() const { return m_state.fullscreen; } 375 bool isFullscreen() const { return m_state.fullscreen; }
376 bool isMaximized() const { return m_state.isMaximized(); } 376 bool isMaximized() const { return m_state.isMaximized(); }
@@ -382,7 +382,7 @@ public:
382 bool isResizable() const { return functions.resize; } 382 bool isResizable() const { return functions.resize; }
383 bool isClosable() const { return functions.close; } 383 bool isClosable() const { return functions.close; }
384 bool isMoveable() const { return functions.move; } 384 bool isMoveable() const { return functions.move; }
385 bool isStuck() const { return stuck; } 385 bool isStuck() const { return m_state.stuck; }
386 bool hasTitlebar() const { return decorations.titlebar; } 386 bool hasTitlebar() const { return decorations.titlebar; }
387 bool isMoving() const { return moving; } 387 bool isMoving() const { return moving; }
388 bool isResizing() const { return resizing; } 388 bool isResizing() const { return resizing; }
@@ -416,8 +416,7 @@ public:
416 const std::string &getWMClassName() const; 416 const std::string &getWMClassName() const;
417 const std::string &getWMClassClass() const; 417 const std::string &getWMClassClass() const;
418 std::string getWMRole() const; 418 std::string getWMRole() const;
419 Focusable::WindowType getWindowType() const; 419 void setWindowType(WindowState::WindowType type);
420 void setWindowType(Focusable::WindowType type);
421 bool isTransient() const; 420 bool isTransient() const;
422 421
423 int x() const { return frame().x(); } 422 int x() const { return frame().x(); }
@@ -437,7 +436,7 @@ public:
437 436
438 unsigned int workspaceNumber() const { return m_workspace_number; } 437 unsigned int workspaceNumber() const { return m_workspace_number; }
439 438
440 int layerNum() const { return m_layernum; } 439 int layerNum() const { return m_state.layernum; }
441 void setLayerNum(int layernum); 440 void setLayerNum(int layernum);
442 441
443 unsigned int titlebarHeight() const; 442 unsigned int titlebarHeight() const;
@@ -531,7 +530,7 @@ private:
531 time_t m_creation_time; 530 time_t m_creation_time;
532 531
533 // Window states 532 // Window states
534 bool moving, resizing, iconic, stuck, m_initialized; 533 bool moving, resizing, m_initialized;
535 534
536 WinClient *m_attaching_tab; 535 WinClient *m_attaching_tab;
537 536
@@ -568,8 +567,6 @@ private:
568 bool resize, move, iconify, maximize, close, tabable; 567 bool resize, move, iconify, maximize, close, tabable;
569 } functions; 568 } functions;
570 569
571 bool m_icon_hidden; ///< if the window is in the iconbar
572 bool m_focus_hidden; ///< if the window is in the NextWindow list
573 typedef FbTk::ConstObjectAccessor<bool, FocusControl> BoolAcc; 570 typedef FbTk::ConstObjectAccessor<bool, FocusControl> BoolAcc;
574 /// if the window is normally focused when mapped 571 /// if the window is normally focused when mapped
575 FbTk::DefaultValue<bool, BoolAcc> m_focus_new; 572 FbTk::DefaultValue<bool, BoolAcc> m_focus_new;
@@ -587,7 +584,6 @@ private:
587 584
588 bool m_placed; ///< determine whether or not we should place the window 585 bool m_placed; ///< determine whether or not we should place the window
589 586
590 int m_layernum;
591 int m_old_layernum; 587 int m_old_layernum;
592 588
593 FbTk::FbWindow &m_parent; ///< window on which we draw move/resize rectangle (the "root window") 589 FbTk::FbWindow &m_parent; ///< window on which we draw move/resize rectangle (the "root window")