added getGnomeLayerAtom, moved WinState enum to FluxboxWindow and fixed include guard

This commit is contained in:
fluxgen 2002-02-17 18:59:01 +00:00
parent 0cfdcba5c7
commit c66f598b64

View file

@ -22,10 +22,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: BaseDisplay.hh,v 1.11 2002/02/11 10:58:48 fluxgen Exp $ // $Id: BaseDisplay.hh,v 1.12 2002/02/17 18:59:01 fluxgen Exp $
#ifndef _BASEDISPLAY_HH_ #ifndef BASEDISPLAY_HH
#define _BASEDISPLAY_HH_ #define BASEDISPLAY_HH
#include "Timer.hh" #include "Timer.hh"
#include "NotCopyable.hh" #include "NotCopyable.hh"
@ -66,22 +66,12 @@ public:
ATTRIB_STACK = 0x20, ATTRIB_STACK = 0x20,
ATTRIB_DECORATION = 0x40 ATTRIB_DECORATION = 0x40
}; };
#ifdef GNOME #ifdef GNOME
enum WinState {
WIN_STATE_STICKY = (1<<0), // everyone knows sticky
WIN_STATE_MINIMIZED = (1<<1), // Reserved - definition is unclear
WIN_STATE_MAXIMIZED_VERT = (1<<2), // window in maximized V state
WIN_STATE_MAXIMIZED_HORIZ = (1<<3), // window in maximized H state
WIN_STATE_HIDDEN = (1<<4), // not on taskbar but window visible
WIN_STATE_SHADED = (1<<5), // shaded (MacOS / Afterstep style)
WIN_STATE_HID_WORKSPACE = (1<<6), // not on current desktop
WIN_STATE_HID_TRANSIENT = (1<<7), // owner of transient is hidden
WIN_STATE_FIXED_POSITION = (1<<8), // window is fixed in position even
WIN_STATE_ARRANGE_IGNORE = (1<<9) // ignore for auto arranging
};
#endif #endif
enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL}; enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL};
enum Stack {STACK_TOP=0, STACK_NORMAL, STACK_BOTTOM};
typedef struct _blackbox_hints { typedef struct _blackbox_hints {
unsigned long flags, attrib, workspace, stack; unsigned long flags, attrib, workspace, stack;
@ -95,7 +85,6 @@ public:
} BlackboxAttributes; } BlackboxAttributes;
#ifdef GNOME #ifdef GNOME
// inline Atom *getGnomeListAtoms() { return gnome_atom_list; }
inline Atom &getGnomeProtAtom() { return gnome_wm_prot; } inline Atom &getGnomeProtAtom() { return gnome_wm_prot; }
inline Atom &getGnomeClientListAtom() { return gnome_wm_win_client_list; } inline Atom &getGnomeClientListAtom() { return gnome_wm_win_client_list; }
inline Atom &getGnomeSupportingWMCheckAtom() { return gnome_wm_supporting_wm_check; } inline Atom &getGnomeSupportingWMCheckAtom() { return gnome_wm_supporting_wm_check; }
@ -104,6 +93,7 @@ public:
inline Atom &getGnomeWorkspaceNamesAtom() { return gnome_wm_win_workspace_names; } inline Atom &getGnomeWorkspaceNamesAtom() { return gnome_wm_win_workspace_names; }
inline Atom &getGnomeStateAtom() { return gnome_wm_win_state; } inline Atom &getGnomeStateAtom() { return gnome_wm_win_state; }
inline Atom &getGnomeHintsAtom() { return gnome_wm_win_hints; } inline Atom &getGnomeHintsAtom() { return gnome_wm_win_hints; }
inline Atom &getGnomeLayerAtom() { return gnome_wm_win_layer; }
#endif //GNOME #endif //GNOME
inline const Atom &getWMChangeStateAtom(void) const inline const Atom &getWMChangeStateAtom(void) const