aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-09-08 19:49:39 (GMT)
committerfluxgen <fluxgen>2002-09-08 19:49:39 (GMT)
commitf2f0606c2ee353d37b21cae7f5628a4e397599b3 (patch)
treebdcdb09c406a0a54539b61be3dabee8043348a68
parent50f7dfc031f991427c061c5aff2dd97a7bd39faf (diff)
downloadfluxbox_pavel-f2f0606c2ee353d37b21cae7f5628a4e397599b3.zip
fluxbox_pavel-f2f0606c2ee353d37b21cae7f5628a4e397599b3.tar.bz2
new transient handling, removed inline, minor comments
-rw-r--r--src/Window.hh109
1 files changed, 57 insertions, 52 deletions
diff --git a/src/Window.hh b/src/Window.hh
index c01372f..80b7003 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.30 2002/09/07 20:13:55 fluxgen Exp $ 25// $Id: Window.hh,v 1.31 2002/09/08 19:49:39 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -94,55 +94,58 @@ public:
94 @name accessors 94 @name accessors
95 */ 95 */
96 //@{ 96 //@{
97 inline bool isTransient() const { return ((transient) ? true : false); } 97 bool isTransient() const { return ((client.transient_for) ? true : false); }
98 inline bool hasTransient() const { return ((client.transient) ? true : false); } 98 bool hasTransient() const { return ((client.transients.size()) ? true : false); }
99 inline bool isManaged() const { return managed; } 99 bool isManaged() const { return managed; }
100 inline bool isFocused() const { return focused; } 100 bool isFocused() const { return focused; }
101 inline bool isVisible() const { return visible; } 101 bool isVisible() const { return visible; }
102 inline bool isIconic() const { return iconic; } 102 bool isIconic() const { return iconic; }
103 inline bool isShaded() const { return shaded; } 103 bool isShaded() const { return shaded; }
104 inline bool isMaximized() const { return maximized; } 104 bool isMaximized() const { return maximized; }
105 inline bool isIconifiable() const { return functions.iconify; } 105 bool isIconifiable() const { return functions.iconify; }
106 inline bool isMaximizable() const { return functions.maximize; } 106 bool isMaximizable() const { return functions.maximize; }
107 inline bool isResizable() const { return functions.resize; } 107 bool isResizable() const { return functions.resize; }
108 inline bool isClosable() const { return functions.close; } 108 bool isClosable() const { return functions.close; }
109 inline bool isStuck() const { return stuck; } 109 bool isStuck() const { return stuck; }
110 inline bool hasTitlebar() const { return decorations.titlebar; } 110 bool hasTitlebar() const { return decorations.titlebar; }
111 inline bool hasTab() const { return (tab!=0 ? true : false); } 111 bool hasTab() const { return (tab!=0 ? true : false); }
112 inline bool isMoving() const { return moving; } 112 bool isMoving() const { return moving; }
113 inline bool isResizing() const { return resizing; } 113 bool isResizing() const { return resizing; }
114 inline const BScreen *getScreen() const { return screen; } 114 const BScreen *getScreen() const { return screen; }
115 inline BScreen *getScreen() { return screen; } 115 BScreen *getScreen() { return screen; }
116 inline const Tab *getTab() const { return tab; } 116 const Tab *getTab() const { return tab; }
117 inline Tab *getTab() { return tab; } 117 Tab *getTab() { return tab; }
118 inline const FluxboxWindow *getTransient() const { return client.transient; } 118 const std::list<FluxboxWindow *> &getTransients() const { return client.transients; }
119 inline FluxboxWindow *getTransient() { return client.transient; } 119 std::list<FluxboxWindow *> &getTransients() { return client.transients; }
120 inline const FluxboxWindow *getTransientFor() const { return client.transient_for; } 120 const FluxboxWindow *getTransientFor() const { return client.transient_for; }
121 inline FluxboxWindow *getTransientFor() { return client.transient_for; } 121 FluxboxWindow *getTransientFor() { return client.transient_for; }
122 122
123 inline const Window &getFrameWindow() const { return frame.window; } 123 const Window &getFrameWindow() const { return frame.window; }
124 inline const Window &getClientWindow() const { return client.window; } 124 const Window &getClientWindow() const { return client.window; }
125 125
126 inline Windowmenu *getWindowmenu() { return windowmenu; } 126 Windowmenu *getWindowmenu() { return windowmenu; }
127 127
128 inline const std::string &getTitle() const { return client.title; } 128 const std::string &getTitle() const { return client.title; }
129 inline const std::string &getIconTitle() const { return client.icon_title; } 129 const std::string &getIconTitle() const { return client.icon_title; }
130 inline int getXFrame() const { return frame.x; } 130 int getXFrame() const { return frame.x; }
131 inline int getYFrame() const { return frame.y; } 131 int getYFrame() const { return frame.y; }
132 inline int getXClient() const { return client.x; } 132 int getXClient() const { return client.x; }
133 inline int getYClient() const { return client.y; } 133 int getYClient() const { return client.y; }
134 inline unsigned int getWorkspaceNumber() const { return workspace_number; } 134 unsigned int getWorkspaceNumber() const { return workspace_number; }
135 inline int getWindowNumber() const { return window_number; } 135 int getWindowNumber() const { return window_number; }
136 inline WinLayer getLayer() const { return m_layer; } 136 WinLayer getLayer() const { return m_layer; }
137 inline unsigned int getWidth() const { return frame.width; } 137 unsigned int getWidth() const { return frame.width; }
138 inline unsigned int getHeight() const { return frame.height; } 138 unsigned int getHeight() const { return frame.height; }
139 inline unsigned int getClientHeight() const { return client.height; } 139 unsigned int getClientHeight() const { return client.height; }
140 inline unsigned int getClientWidth() const { return client.width; } 140 unsigned int getClientWidth() const { return client.width; }
141 inline unsigned int getTitleHeight() const { return frame.title_h; } 141 unsigned int getTitleHeight() const { return frame.title_h; }
142 const std::string className() const { return m_class_name; } 142 const std::string &className() const { return m_class_name; }
143 const std::string instanceName() const { return m_instance_name; } 143 const std::string &instanceName() const { return m_instance_name; }
144 bool isLowerTab() const; 144 bool isLowerTab() const;
145 // signals 145 /**
146 @name signals
147 */
148 //@{
146 FbTk::Subject &stateSig() { return m_statesig; } 149 FbTk::Subject &stateSig() { return m_statesig; }
147 const FbTk::Subject &stateSig() const { return m_statesig; } 150 const FbTk::Subject &stateSig() const { return m_statesig; }
148 FbTk::Subject &hintSig() { return m_hintsig; } 151 FbTk::Subject &hintSig() { return m_hintsig; }
@@ -151,9 +154,11 @@ public:
151 const FbTk::Subject &workspaceSig() const { return m_workspacesig; } 154 const FbTk::Subject &workspaceSig() const { return m_workspacesig; }
152 //@} 155 //@}
153 156
154 inline void setWindowNumber(int n) { window_number = n; } 157 //@}
158
159 void setWindowNumber(int n) { window_number = n; }
155 160
156 inline const timeval &getLastFocusTime() const {return lastFocusTime;} 161 const timeval &getLastFocusTime() const {return lastFocusTime;}
157 162
158 bool validateClient(); 163 bool validateClient();
159 bool setInputFocus(); 164 bool setInputFocus();
@@ -246,8 +251,8 @@ private:
246 Decoration old_decoration; 251 Decoration old_decoration;
247 252
248 struct _client { 253 struct _client {
249 FluxboxWindow *transient_for, // which window are we a transient for? 254 FluxboxWindow *transient_for; // which window are we a transient for?
250 *transient; // which window is our transient? 255 std::list<FluxboxWindow *> transients; // which windows are our transients?
251 Window window, window_group; 256 Window window, window_group;
252 257
253 std::string title, icon_title; 258 std::string title, icon_title;