Moved some structs and constants into BaseDisplay

2 files changed, 25 insertions, 28 deletions

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index dc719cd..060438f 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -364,7 +364,7 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
 #endif // NEWWMSPEC
 
 #ifdef GNOME
-        /*
+        
         gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False);
         gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False);
         gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False);
@@ -377,7 +377,7 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
         gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False);
         gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False);
         gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False);
-        */
+        
 #endif // GNOME
 
         cursor.session = XCreateFontCursor(display, XC_left_ptr);
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 84ae92e..d2c3bb9 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -35,32 +35,6 @@ class ScreenInfo;
 #include "LinkedList.hh"
 #include "Timer.hh"
 
-#define AttribShaded      (1l << 0)
-#define AttribMaxHoriz    (1l << 1)
-#define AttribMaxVert     (1l << 2)
-#define AttribOmnipresent (1l << 3)
-#define AttribWorkspace   (1l << 4)
-#define AttribStack       (1l << 5)
-#define AttribDecoration  (1l << 6)
-
-#define StackTop          (0)
-#define StackNormal       (1)
-#define StackBottom       (2)
-
-#define DecorNone         (0)
-#define DecorNormal       (1)
-#define DecorTiny         (2)
-#define DecorTool         (3)
-
-typedef struct _blackbox_hints {
-  unsigned long flags, attrib, workspace, stack, decoration;
-} BlackboxHints;
-
-typedef struct _blackbox_attributes {
-  unsigned long flags, attrib, workspace, stack;
-  int premax_x, premax_y;
-  unsigned int premax_w, premax_h;
-} BlackboxAttributes;
 
 #define PropBlackboxHintsElements      (5)
 #define PropBlackboxAttributesElements (8)
@@ -77,6 +51,29 @@ class BaseDisplay {
 public:
   BaseDisplay(char *, char * = 0);
   virtual ~BaseDisplay(void);
+        
+        enum Attrib {
+                ATTRIB_SHADED = 0x01,
+                ATTRIB_MAXHORIZ = 0x02,
+                ATTRIB_MAXVERT = 0x04,
+                ATTRIB_OMNIPRESENT = 0x08,
+                ATTRIB_WORKSPACE = 0x10,
+                ATTRIB_STACK = 0x20,            
+                ATTRIB_DECORATION = 0x40
+                };
+        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;
+                Decor decoration;
+        } BlackboxHints;
+
+        typedef struct _blackbox_attributes {
+        unsigned long flags, attrib, workspace, stack;
+          int premax_x, premax_y;
+        unsigned int premax_w, premax_h;
+        } BlackboxAttributes;
 
 #ifdef GNOME
         inline Atom *getGnomeListAtoms() { return gnome_atom_list; }