diff options
author | unknown <unknown> | 2002-01-11 11:59:54 (GMT) |
---|---|---|
committer | unknown <unknown> | 2002-01-11 11:59:54 (GMT) |
commit | 61661d638e34b3ce6c986d5a53b8c08c1051d422 (patch) | |
tree | f0b87676e95070afee163f76902efd0c4d5b5fe6 /src/Window.hh | |
parent | f98c3c9045397bd9497621deb55b310366f8a5de (diff) | |
parent | a3d2a1cf0a5ab724e19a91915fe97842f52260d5 (diff) | |
download | fluxbox_pavel-61661d638e34b3ce6c986d5a53b8c08c1051d422.zip fluxbox_pavel-61661d638e34b3ce6c986d5a53b8c08c1051d422.tar.bz2 |
This commit was manufactured by cvs2svn to create tagRelease-0_1_6
'Release-0_1_6'.
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/Window.hh b/src/Window.hh index f08acb0..2c705d8 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -1,3 +1,6 @@ | |||
1 | // Window.hh for Fluxbox Window Manager | ||
2 | // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org) | ||
3 | // | ||
1 | // Window.hh for Blackbox - an X11 Window manager | 4 | // Window.hh for Blackbox - an X11 Window manager |
2 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) | 5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) |
3 | // | 6 | // |
@@ -19,9 +22,7 @@ | |||
19 | // 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 |
20 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
21 | 24 | ||
22 | // | 25 | // $Id: Window.hh,v 1.4 2002/01/11 10:40:59 fluxgen Exp $ |
23 | //Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org) | ||
24 | // See LICENSE for copyright and license | ||
25 | 26 | ||
26 | #ifndef _WINDOW_HH_ | 27 | #ifndef _WINDOW_HH_ |
27 | #define _WINDOW_HH_ | 28 | #define _WINDOW_HH_ |
@@ -150,7 +151,7 @@ public: | |||
150 | void restore(void); | 151 | void restore(void); |
151 | void configure(int dx, int dy, unsigned int dw, unsigned int dh); | 152 | void configure(int dx, int dy, unsigned int dw, unsigned int dh); |
152 | void setWorkspace(int n); | 153 | void setWorkspace(int n); |
153 | void changeBlackboxHints(BlackboxHints *); | 154 | void changeBlackboxHints(BaseDisplay::BlackboxHints *); |
154 | void restoreAttributes(void); | 155 | void restoreAttributes(void); |
155 | 156 | ||
156 | void buttonPressEvent(XButtonEvent *); | 157 | void buttonPressEvent(XButtonEvent *); |
@@ -178,14 +179,13 @@ public: | |||
178 | 179 | ||
179 | private: | 180 | private: |
180 | BImageControl *image_ctrl; | 181 | BImageControl *image_ctrl; |
181 | //Fluxbox *fluxbox; | ||
182 | 182 | ||
183 | bool moving, resizing, shaded, maximized, visible, iconic, transient, | 183 | bool moving, resizing, shaded, maximized, visible, iconic, transient, |
184 | focused, stuck, modal, send_focus_message, managed; | 184 | focused, stuck, modal, send_focus_message, managed; |
185 | BScreen *screen; | 185 | BScreen *screen; |
186 | BTimer *timer; | 186 | BTimer *timer; |
187 | Display *display; | 187 | Display *display; |
188 | BlackboxAttributes blackbox_attrib; | 188 | BaseDisplay::BlackboxAttributes blackbox_attrib; |
189 | 189 | ||
190 | Time lastButtonPressTime; | 190 | Time lastButtonPressTime; |
191 | Windowmenu *windowmenu; | 191 | Windowmenu *windowmenu; |
@@ -207,7 +207,7 @@ private: | |||
207 | unsigned long initial_state, normal_hint_flags, wm_hint_flags; | 207 | unsigned long initial_state, normal_hint_flags, wm_hint_flags; |
208 | 208 | ||
209 | MwmHints *mwm_hint; | 209 | MwmHints *mwm_hint; |
210 | BlackboxHints *blackbox_hint; | 210 | BaseDisplay::BlackboxHints *blackbox_hint; |
211 | } client; | 211 | } client; |
212 | 212 | ||
213 | struct _decorations { | 213 | struct _decorations { |
@@ -221,9 +221,8 @@ private: | |||
221 | 221 | ||
222 | bool usetab; | 222 | bool usetab; |
223 | Tab *tab; | 223 | Tab *tab; |
224 | //Tab is also a friend | 224 | friend class Tab; |
225 | friend class Tab; | 225 | |
226 | |||
227 | typedef void (*ButtonDrawProc)(FluxboxWindow *, Window, bool); | 226 | typedef void (*ButtonDrawProc)(FluxboxWindow *, Window, bool); |
228 | typedef void (*ButtonEventProc)(FluxboxWindow *, XButtonEvent *); | 227 | typedef void (*ButtonEventProc)(FluxboxWindow *, XButtonEvent *); |
229 | 228 | ||
@@ -258,7 +257,7 @@ private: | |||
258 | bevel_w, resize_w, resize_h, snap_w, snap_h; | 257 | bevel_w, resize_w, resize_h, snap_w, snap_h; |
259 | } frame; | 258 | } frame; |
260 | 259 | ||
261 | enum { F_NoInput = 0, F_Passive, F_LocallyActive, F_GloballyActive }; | 260 | enum { F_NOINPUT = 0, F_PASSIVE, F_LOCALLYACTIVE, F_GLOBALLYACTIVE }; |
262 | 261 | ||
263 | void createButton(int type, ButtonEventProc, ButtonEventProc, ButtonDrawProc); | 262 | void createButton(int type, ButtonEventProc, ButtonEventProc, ButtonDrawProc); |
264 | Window findTitleButton(int type); | 263 | Window findTitleButton(int type); |