diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-21 14:05:44 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-21 14:05:44 (GMT) |
commit | 533c70cb570c56a586f8946700f57a832128a705 (patch) | |
tree | 72540dbd91014a29d10c9f798fd17f6a59c71504 /src/Window.hh | |
parent | 0116a83aa6b5275cbe3cd2bd851dc6959cacf79b (diff) | |
download | fluxbox-533c70cb570c56a586f8946700f57a832128a705.zip fluxbox-533c70cb570c56a586f8946700f57a832128a705.tar.bz2 |
some cleanup
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/Window.hh b/src/Window.hh index 9780ef2..14f063a 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -87,18 +87,6 @@ public: | |||
87 | MwmDecorMaximize = (1l << 6) /// maximize | 87 | MwmDecorMaximize = (1l << 6) /// maximize |
88 | }; | 88 | }; |
89 | 89 | ||
90 | /// attributes for BlackboxHints | ||
91 | enum Attrib { | ||
92 | ATTRIB_SHADED = 0x01, ///< shaded | ||
93 | ATTRIB_MAXHORIZ = 0x02, ///< maximized horizontal | ||
94 | ATTRIB_MAXVERT = 0x04, ///< maximized vertical | ||
95 | ATTRIB_OMNIPRESENT = 0x08, ///< omnipresent (sticky) | ||
96 | ATTRIB_WORKSPACE = 0x10, ///< workspace | ||
97 | ATTRIB_STACK = 0x20, ///< stack | ||
98 | ATTRIB_DECORATION = 0x40, ///< decorations | ||
99 | ATTRIB_HIDDEN = 0x80 ///< hidden | ||
100 | }; | ||
101 | |||
102 | /** | 90 | /** |
103 | * Types of maximization | 91 | * Types of maximization |
104 | */ | 92 | */ |
@@ -141,13 +129,6 @@ public: | |||
141 | CENTER = 8 | 129 | CENTER = 8 |
142 | }; | 130 | }; |
143 | 131 | ||
144 | /// holds old blackbox attributes | ||
145 | typedef struct _blackbox_attributes { | ||
146 | unsigned long flags, attrib, workspace, stack; | ||
147 | long premax_x, premax_y; | ||
148 | unsigned long premax_w, premax_h; | ||
149 | } BlackboxAttributes; | ||
150 | |||
151 | typedef std::list<WinClient *> ClientList; | 132 | typedef std::list<WinClient *> ClientList; |
152 | 133 | ||
153 | /// create a window from a client | 134 | /// create a window from a client |
@@ -308,7 +289,6 @@ public: | |||
308 | void getMaxSize(unsigned int* width, unsigned int* height) const; | 289 | void getMaxSize(unsigned int* width, unsigned int* height) const; |
309 | void setWorkspace(int n); | 290 | void setWorkspace(int n); |
310 | void updateFunctions(); | 291 | void updateFunctions(); |
311 | void restoreAttributes(); | ||
312 | /** | 292 | /** |
313 | * Show window meny at at given position | 293 | * Show window meny at at given position |
314 | * @param mx position | 294 | * @param mx position |
@@ -507,8 +487,6 @@ public: | |||
507 | bool oplock; ///< Used to help stop transient loops occurring by locking a window during certain operations | 487 | bool oplock; ///< Used to help stop transient loops occurring by locking a window during certain operations |
508 | 488 | ||
509 | private: | 489 | private: |
510 | static const int PropBlackboxAttributesElements = 8; | ||
511 | |||
512 | void setupWindow(); | 490 | void setupWindow(); |
513 | void updateButtons(); | 491 | void updateButtons(); |
514 | 492 | ||
@@ -530,8 +508,7 @@ private: | |||
530 | 508 | ||
531 | bool getState(); | 509 | bool getState(); |
532 | void updateMWMHintsFromClient(WinClient &client); | 510 | void updateMWMHintsFromClient(WinClient &client); |
533 | void saveBlackboxAttribs(); | 511 | void associateClientWindow(); |
534 | void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1, int gravity = ForgetGravity, unsigned int client_bw = 0); | ||
535 | 512 | ||
536 | void setState(unsigned long stateval, bool setting_up); | 513 | void setState(unsigned long stateval, bool setting_up); |
537 | /// set the layer of a fullscreen window | 514 | /// set the layer of a fullscreen window |
@@ -574,7 +551,6 @@ private: | |||
574 | 551 | ||
575 | FbTk::Timer m_timer; | 552 | FbTk::Timer m_timer; |
576 | Display *display; /// display connection | 553 | Display *display; /// display connection |
577 | BlackboxAttributes m_blackbox_attrib; | ||
578 | 554 | ||
579 | int m_button_grab_x, m_button_grab_y; // handles last button press event for move | 555 | int m_button_grab_x, m_button_grab_y; // handles last button press event for move |
580 | int m_last_resize_x, m_last_resize_y; // handles last button press event for resize | 556 | int m_last_resize_x, m_last_resize_y; // handles last button press event for resize |