aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-19 13:53:35 (GMT)
committerfluxgen <fluxgen>2001-12-19 13:53:35 (GMT)
commitcf442c375ab9d69754ff1aea1f1bc6b37bdb5825 (patch)
tree2b67e6f9a6e9110498bfa45c36a1bb312c207362 /src/Window.hh
parent479495b2fac9d8ecff374f865108cec7787a05e2 (diff)
downloadfluxbox-cf442c375ab9d69754ff1aea1f1bc6b37bdb5825.zip
fluxbox-cf442c375ab9d69754ff1aea1f1bc6b37bdb5825.tar.bz2
Updated Attrib flags and struct
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/Window.hh b/src/Window.hh
index f08acb0..63d10e2 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -1,3 +1,6 @@
1// Window.hh for Fluxbox
2// Copyright (c) 2001 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,10 +22,6 @@
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//
23//Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org)
24// See LICENSE for copyright and license
25
26#ifndef _WINDOW_HH_ 25#ifndef _WINDOW_HH_
27#define _WINDOW_HH_ 26#define _WINDOW_HH_
28 27
@@ -150,7 +149,7 @@ public:
150 void restore(void); 149 void restore(void);
151 void configure(int dx, int dy, unsigned int dw, unsigned int dh); 150 void configure(int dx, int dy, unsigned int dw, unsigned int dh);
152 void setWorkspace(int n); 151 void setWorkspace(int n);
153 void changeBlackboxHints(BlackboxHints *); 152 void changeBlackboxHints(BaseDisplay::BlackboxHints *);
154 void restoreAttributes(void); 153 void restoreAttributes(void);
155 154
156 void buttonPressEvent(XButtonEvent *); 155 void buttonPressEvent(XButtonEvent *);
@@ -178,14 +177,13 @@ public:
178 177
179private: 178private:
180 BImageControl *image_ctrl; 179 BImageControl *image_ctrl;
181 //Fluxbox *fluxbox;
182 180
183 bool moving, resizing, shaded, maximized, visible, iconic, transient, 181 bool moving, resizing, shaded, maximized, visible, iconic, transient,
184 focused, stuck, modal, send_focus_message, managed; 182 focused, stuck, modal, send_focus_message, managed;
185 BScreen *screen; 183 BScreen *screen;
186 BTimer *timer; 184 BTimer *timer;
187 Display *display; 185 Display *display;
188 BlackboxAttributes blackbox_attrib; 186 BaseDisplay::BlackboxAttributes blackbox_attrib;
189 187
190 Time lastButtonPressTime; 188 Time lastButtonPressTime;
191 Windowmenu *windowmenu; 189 Windowmenu *windowmenu;
@@ -207,7 +205,7 @@ private:
207 unsigned long initial_state, normal_hint_flags, wm_hint_flags; 205 unsigned long initial_state, normal_hint_flags, wm_hint_flags;
208 206
209 MwmHints *mwm_hint; 207 MwmHints *mwm_hint;
210 BlackboxHints *blackbox_hint; 208 BaseDisplay::BlackboxHints *blackbox_hint;
211 } client; 209 } client;
212 210
213 struct _decorations { 211 struct _decorations {
@@ -221,9 +219,8 @@ private:
221 219
222 bool usetab; 220 bool usetab;
223 Tab *tab; 221 Tab *tab;
224 //Tab is also a friend 222 friend class Tab;
225 friend class Tab; 223
226
227 typedef void (*ButtonDrawProc)(FluxboxWindow *, Window, bool); 224 typedef void (*ButtonDrawProc)(FluxboxWindow *, Window, bool);
228 typedef void (*ButtonEventProc)(FluxboxWindow *, XButtonEvent *); 225 typedef void (*ButtonEventProc)(FluxboxWindow *, XButtonEvent *);
229 226