diff options
author | rathnor <rathnor> | 2003-05-07 16:21:26 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-05-07 16:21:26 (GMT) |
commit | d63bf127ad6391f3e8408ddfd0ba79c4841a1ecf (patch) | |
tree | 5888bcda58581a3c8f94bc4bac4197d585c0b459 /src/Window.hh | |
parent | de68c88ed8ff8c7a887495a74de004f9da7f56df (diff) | |
download | fluxbox-d63bf127ad6391f3e8408ddfd0ba79c4841a1ecf.zip fluxbox-d63bf127ad6391f3e8408ddfd0ba79c4841a1ecf.tar.bz2 |
transient fixes by making them WinClients
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/Window.hh b/src/Window.hh index 426196d..cc7eff9 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.66 2003/05/01 13:19:36 rathnor Exp $ | 25 | // $Id: Window.hh,v 1.67 2003/05/07 16:21:26 rathnor Exp $ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
@@ -238,8 +238,6 @@ public: | |||
238 | @name accessors | 238 | @name accessors |
239 | */ | 239 | */ |
240 | //@{ | 240 | //@{ |
241 | bool isTransient() const; | ||
242 | bool hasTransient() const; | ||
243 | inline bool isManaged() const { return m_managed; } | 241 | inline bool isManaged() const { return m_managed; } |
244 | inline bool isFocused() const { return focused; } | 242 | inline bool isFocused() const { return focused; } |
245 | inline bool isVisible() const { return m_frame.isVisible(); } | 243 | inline bool isVisible() const { return m_frame.isVisible(); } |
@@ -267,11 +265,6 @@ public: | |||
267 | inline const FbTk::XLayerItem &getLayerItem() const { return m_layeritem; } | 265 | inline const FbTk::XLayerItem &getLayerItem() const { return m_layeritem; } |
268 | inline FbTk::XLayerItem &getLayerItem() { return m_layeritem; } | 266 | inline FbTk::XLayerItem &getLayerItem() { return m_layeritem; } |
269 | 267 | ||
270 | const std::list<FluxboxWindow *> &getTransients() const; | ||
271 | std::list<FluxboxWindow *> &getTransients(); | ||
272 | const FluxboxWindow *getTransientFor() const; | ||
273 | FluxboxWindow *getTransientFor(); | ||
274 | |||
275 | Window getClientWindow() const; | 268 | Window getClientWindow() const; |
276 | 269 | ||
277 | FbTk::FbWindow &getFbWindow() { return m_frame.window(); } | 270 | FbTk::FbWindow &getFbWindow() { return m_frame.window(); } |
@@ -335,6 +328,9 @@ public: | |||
335 | FluxboxWindow &m_win; | 328 | FluxboxWindow &m_win; |
336 | }; | 329 | }; |
337 | 330 | ||
331 | bool oplock; // Used to help stop transient loops occurring by locking a window | ||
332 | // during certain operations | ||
333 | |||
338 | private: | 334 | private: |
339 | void init(); | 335 | void init(); |
340 | 336 | ||
@@ -348,8 +344,6 @@ private: | |||
348 | /// try to attach current attaching client to a window at pos x, y | 344 | /// try to attach current attaching client to a window at pos x, y |
349 | void attachTo(int x, int y); | 345 | void attachTo(int x, int y); |
350 | 346 | ||
351 | void updateTransientInfo(); | ||
352 | |||
353 | bool getState(); | 347 | bool getState(); |
354 | /// gets title string from client window and updates frame's title | 348 | /// gets title string from client window and updates frame's title |
355 | void updateTitleFromClient(); | 349 | void updateTitleFromClient(); |
@@ -387,8 +381,8 @@ private: | |||
387 | std::string m_class_name; /// class name from WM_CLASS | 381 | std::string m_class_name; /// class name from WM_CLASS |
388 | 382 | ||
389 | //Window state | 383 | //Window state |
390 | bool moving, resizing, shaded, maximized, iconic, transient, | 384 | bool moving, resizing, shaded, maximized, iconic, |
391 | focused, stuck, modal, send_focus_message, m_managed; | 385 | focused, stuck, send_focus_message, m_managed; |
392 | WinClient *m_attaching_tab; | 386 | WinClient *m_attaching_tab; |
393 | 387 | ||
394 | BScreen &screen; /// screen on which this window exist | 388 | BScreen &screen; /// screen on which this window exist |