aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-02-17 18:59:01 (GMT)
committerfluxgen <fluxgen>2002-02-17 18:59:01 (GMT)
commitc66f598b649aa8a935a5eb1bc1a52fa22fc4ad82 (patch)
tree008dc3afa5d7f0df47c3b0a9c768bd4c617fa757
parent0cfdcba5c71722c769a254bebf5ef4497c51616e (diff)
downloadfluxbox-c66f598b649aa8a935a5eb1bc1a52fa22fc4ad82.zip
fluxbox-c66f598b649aa8a935a5eb1bc1a52fa22fc4ad82.tar.bz2
added getGnomeLayerAtom, moved WinState enum to FluxboxWindow and fixed include guard
-rw-r--r--src/BaseDisplay.hh24
1 files changed, 7 insertions, 17 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 991887f..31bff6e 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -22,10 +22,10 @@
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: BaseDisplay.hh,v 1.11 2002/02/11 10:58:48 fluxgen Exp $ 25// $Id: BaseDisplay.hh,v 1.12 2002/02/17 18:59:01 fluxgen Exp $
26 26
27#ifndef _BASEDISPLAY_HH_ 27#ifndef BASEDISPLAY_HH
28#define _BASEDISPLAY_HH_ 28#define BASEDISPLAY_HH
29 29
30#include "Timer.hh" 30#include "Timer.hh"
31#include "NotCopyable.hh" 31#include "NotCopyable.hh"
@@ -66,22 +66,12 @@ public:
66 ATTRIB_STACK = 0x20, 66 ATTRIB_STACK = 0x20,
67 ATTRIB_DECORATION = 0x40 67 ATTRIB_DECORATION = 0x40
68 }; 68 };
69
69 #ifdef GNOME 70 #ifdef GNOME
70 enum WinState { 71
71 WIN_STATE_STICKY = (1<<0), // everyone knows sticky
72 WIN_STATE_MINIMIZED = (1<<1), // Reserved - definition is unclear
73 WIN_STATE_MAXIMIZED_VERT = (1<<2), // window in maximized V state
74 WIN_STATE_MAXIMIZED_HORIZ = (1<<3), // window in maximized H state
75 WIN_STATE_HIDDEN = (1<<4), // not on taskbar but window visible
76 WIN_STATE_SHADED = (1<<5), // shaded (MacOS / Afterstep style)
77 WIN_STATE_HID_WORKSPACE = (1<<6), // not on current desktop
78 WIN_STATE_HID_TRANSIENT = (1<<7), // owner of transient is hidden
79 WIN_STATE_FIXED_POSITION = (1<<8), // window is fixed in position even
80 WIN_STATE_ARRANGE_IGNORE = (1<<9) // ignore for auto arranging
81 };
82 #endif 72 #endif
83 enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL}; 73 enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL};
84 enum Stack {STACK_TOP=0, STACK_NORMAL, STACK_BOTTOM}; 74
85 75
86 typedef struct _blackbox_hints { 76 typedef struct _blackbox_hints {
87 unsigned long flags, attrib, workspace, stack; 77 unsigned long flags, attrib, workspace, stack;
@@ -95,7 +85,6 @@ public:
95 } BlackboxAttributes; 85 } BlackboxAttributes;
96 86
97#ifdef GNOME 87#ifdef GNOME
98// inline Atom *getGnomeListAtoms() { return gnome_atom_list; }
99 inline Atom &getGnomeProtAtom() { return gnome_wm_prot; } 88 inline Atom &getGnomeProtAtom() { return gnome_wm_prot; }
100 inline Atom &getGnomeClientListAtom() { return gnome_wm_win_client_list; } 89 inline Atom &getGnomeClientListAtom() { return gnome_wm_win_client_list; }
101 inline Atom &getGnomeSupportingWMCheckAtom() { return gnome_wm_supporting_wm_check; } 90 inline Atom &getGnomeSupportingWMCheckAtom() { return gnome_wm_supporting_wm_check; }
@@ -104,6 +93,7 @@ public:
104 inline Atom &getGnomeWorkspaceNamesAtom() { return gnome_wm_win_workspace_names; } 93 inline Atom &getGnomeWorkspaceNamesAtom() { return gnome_wm_win_workspace_names; }
105 inline Atom &getGnomeStateAtom() { return gnome_wm_win_state; } 94 inline Atom &getGnomeStateAtom() { return gnome_wm_win_state; }
106 inline Atom &getGnomeHintsAtom() { return gnome_wm_win_hints; } 95 inline Atom &getGnomeHintsAtom() { return gnome_wm_win_hints; }
96 inline Atom &getGnomeLayerAtom() { return gnome_wm_win_layer; }
107#endif //GNOME 97#endif //GNOME
108 98
109 inline const Atom &getWMChangeStateAtom(void) const 99 inline const Atom &getWMChangeStateAtom(void) const