diff options
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Window.hh b/src/Window.hh index 726b747..9991bb6 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -263,6 +263,7 @@ public: | |||
263 | void moveResize(int x, int y, unsigned int width, unsigned int height, bool send_event = false); | 263 | void moveResize(int x, int y, unsigned int width, unsigned int height, bool send_event = false); |
264 | /// move to pos x,y and resize client window to size width, height | 264 | /// move to pos x,y and resize client window to size width, height |
265 | void moveResizeForClient(int x, int y, unsigned int width, unsigned int height, int gravity = ForgetGravity, unsigned int client_bw = 0); | 265 | void moveResizeForClient(int x, int y, unsigned int width, unsigned int height, int gravity = ForgetGravity, unsigned int client_bw = 0); |
266 | void maxSize(unsigned int &width, unsigned int &height); | ||
266 | void setWorkspace(int n); | 267 | void setWorkspace(int n); |
267 | void changeBlackboxHints(const BlackboxHints &bh); | 268 | void changeBlackboxHints(const BlackboxHints &bh); |
268 | void updateFunctions(); | 269 | void updateFunctions(); |
@@ -334,7 +335,6 @@ public: | |||
334 | inline bool isFocusHidden() const { return m_focus_hidden; } | 335 | inline bool isFocusHidden() const { return m_focus_hidden; } |
335 | inline bool isIconHidden() const { return m_icon_hidden; } | 336 | inline bool isIconHidden() const { return m_icon_hidden; } |
336 | inline bool isManaged() const { return m_initialized; } | 337 | inline bool isManaged() const { return m_initialized; } |
337 | inline bool isFocused() const { return focused; } | ||
338 | bool isVisible() const; | 338 | bool isVisible() const; |
339 | inline bool isIconic() { return iconic; } | 339 | inline bool isIconic() { return iconic; } |
340 | inline bool isIconic() const { return iconic; } | 340 | inline bool isIconic() const { return iconic; } |
@@ -361,9 +361,6 @@ public: | |||
361 | inline WinClient &winClient() { return *m_client; } | 361 | inline WinClient &winClient() { return *m_client; } |
362 | inline const WinClient &winClient() const { return *m_client; } | 362 | inline const WinClient &winClient() const { return *m_client; } |
363 | 363 | ||
364 | inline const BScreen &screen() const { return m_screen; } | ||
365 | inline BScreen &screen() { return m_screen; } | ||
366 | |||
367 | inline const FbTk::XLayerItem &layerItem() const { return m_frame.layerItem(); } | 364 | inline const FbTk::XLayerItem &layerItem() const { return m_frame.layerItem(); } |
368 | inline FbTk::XLayerItem &layerItem() { return m_frame.layerItem(); } | 365 | inline FbTk::XLayerItem &layerItem() { return m_frame.layerItem(); } |
369 | 366 | ||
@@ -378,6 +375,7 @@ public: | |||
378 | const FbTk::FbWindow &parent() const { return m_parent; } | 375 | const FbTk::FbWindow &parent() const { return m_parent; } |
379 | FbTk::FbWindow &parent() { return m_parent; } | 376 | FbTk::FbWindow &parent() { return m_parent; } |
380 | 377 | ||
378 | bool acceptsFocus() const; | ||
381 | const FbTk::FbPixmap &iconPixmap() const; | 379 | const FbTk::FbPixmap &iconPixmap() const; |
382 | const FbTk::FbPixmap &iconMask() const; | 380 | const FbTk::FbPixmap &iconMask() const; |
383 | const std::string &title() const; | 381 | const std::string &title() const; |
@@ -421,7 +419,6 @@ public: | |||
421 | FbTk::Subject &dieSig() { return m_diesig; } | 419 | FbTk::Subject &dieSig() { return m_diesig; } |
422 | const FbTk::Subject &dieSig() const { return m_diesig; } | 420 | const FbTk::Subject &dieSig() const { return m_diesig; } |
423 | FbTk::Subject &focusSig() { return m_focussig; } | 421 | FbTk::Subject &focusSig() { return m_focussig; } |
424 | FbTk::Subject &titleSig() { return m_titlesig; } | ||
425 | FbTk::Subject &attentionSig() { return m_attentionsig; } | 422 | FbTk::Subject &attentionSig() { return m_attentionsig; } |
426 | /** @} */ // end group signals | 423 | /** @} */ // end group signals |
427 | 424 | ||
@@ -493,7 +490,6 @@ private: | |||
493 | m_layersig, | 490 | m_layersig, |
494 | m_workspacesig, | 491 | m_workspacesig, |
495 | m_diesig, m_focussig, | 492 | m_diesig, m_focussig, |
496 | m_titlesig, | ||
497 | m_attentionsig; | 493 | m_attentionsig; |
498 | 494 | ||
499 | class ThemeListener: public FbTk::Observer { | 495 | class ThemeListener: public FbTk::Observer { |
@@ -509,14 +505,13 @@ private: | |||
509 | 505 | ||
510 | // Window states | 506 | // Window states |
511 | bool moving, resizing, shaded, iconic, | 507 | bool moving, resizing, shaded, iconic, |
512 | focused, stuck, m_initialized, fullscreen; | 508 | stuck, m_initialized, fullscreen; |
513 | 509 | ||
514 | int maximized; | 510 | int maximized; |
515 | 511 | ||
516 | WinClient *m_attaching_tab; | 512 | WinClient *m_attaching_tab; |
517 | 513 | ||
518 | bool m_attention_state; | 514 | bool m_attention_state; |
519 | BScreen &m_screen; /// screen on which this window exist | ||
520 | FbTk::Timer m_timer; | 515 | FbTk::Timer m_timer; |
521 | Display *display; /// display connection | 516 | Display *display; /// display connection |
522 | BlackboxAttributes m_blackbox_attrib; | 517 | BlackboxAttributes m_blackbox_attrib; |