added getGnomeLayerAtom, moved WinState enum to FluxboxWindow and fixed include guard
fluxgen fluxgen
1 files changed,
7 insertions(+),
17 deletions(-)
jump to
M
src/BaseDisplay.hh
→
src/BaseDisplay.hh
@@ -22,10 +22,10 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // 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_ -#define _BASEDISPLAY_HH_ +#ifndef BASEDISPLAY_HH +#define BASEDISPLAY_HH #include "Timer.hh" #include "NotCopyable.hh"@@ -66,22 +66,12 @@ ATTRIB_WORKSPACE = 0x10,
ATTRIB_STACK = 0x20, ATTRIB_DECORATION = 0x40 }; + #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 enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL}; - enum Stack {STACK_TOP=0, STACK_NORMAL, STACK_BOTTOM}; + typedef struct _blackbox_hints { unsigned long flags, attrib, workspace, stack;@@ -95,7 +85,6 @@ unsigned int premax_w, premax_h;
} BlackboxAttributes; #ifdef GNOME -// inline Atom *getGnomeListAtoms() { return gnome_atom_list; } inline Atom &getGnomeProtAtom() { return gnome_wm_prot; } inline Atom &getGnomeClientListAtom() { return gnome_wm_win_client_list; } inline Atom &getGnomeSupportingWMCheckAtom() { return gnome_wm_supporting_wm_check; }@@ -104,6 +93,7 @@ inline Atom &getGnomeWorkspaceCountAtom() { return gnome_wm_win_workspace_count; }
inline Atom &getGnomeWorkspaceNamesAtom() { return gnome_wm_win_workspace_names; } inline Atom &getGnomeStateAtom() { return gnome_wm_win_state; } inline Atom &getGnomeHintsAtom() { return gnome_wm_win_hints; } + inline Atom &getGnomeLayerAtom() { return gnome_wm_win_layer; } #endif //GNOME inline const Atom &getWMChangeStateAtom(void) const