aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-19 13:49:06 (GMT)
committerfluxgen <fluxgen>2001-12-19 13:49:06 (GMT)
commit479495b2fac9d8ecff374f865108cec7787a05e2 (patch)
tree12d157a6242dceb654410d36e24f7defdcad363a
parent3203526c22f6d65f9aeee21d12d6ec0616265d71 (diff)
downloadfluxbox_paul-479495b2fac9d8ecff374f865108cec7787a05e2.zip
fluxbox_paul-479495b2fac9d8ecff374f865108cec7787a05e2.tar.bz2
Moved some structs and constants into BaseDisplay
-rw-r--r--src/BaseDisplay.cc4
-rw-r--r--src/BaseDisplay.hh49
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) {
364#endif // NEWWMSPEC 364#endif // NEWWMSPEC
365 365
366#ifdef GNOME 366#ifdef GNOME
367 /* 367
368 gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False); 368 gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False);
369 gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False); 369 gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False);
370 gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False); 370 gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False);
@@ -377,7 +377,7 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
377 gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False); 377 gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False);
378 gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False); 378 gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False);
379 gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False); 379 gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False);
380 */ 380
381#endif // GNOME 381#endif // GNOME
382 382
383 cursor.session = XCreateFontCursor(display, XC_left_ptr); 383 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;
35#include "LinkedList.hh" 35#include "LinkedList.hh"
36#include "Timer.hh" 36#include "Timer.hh"
37 37
38#define AttribShaded (1l << 0)
39#define AttribMaxHoriz (1l << 1)
40#define AttribMaxVert (1l << 2)
41#define AttribOmnipresent (1l << 3)
42#define AttribWorkspace (1l << 4)
43#define AttribStack (1l << 5)
44#define AttribDecoration (1l << 6)
45
46#define StackTop (0)
47#define StackNormal (1)
48#define StackBottom (2)
49
50#define DecorNone (0)
51#define DecorNormal (1)
52#define DecorTiny (2)
53#define DecorTool (3)
54
55typedef struct _blackbox_hints {
56 unsigned long flags, attrib, workspace, stack, decoration;
57} BlackboxHints;
58
59typedef struct _blackbox_attributes {
60 unsigned long flags, attrib, workspace, stack;
61 int premax_x, premax_y;
62 unsigned int premax_w, premax_h;
63} BlackboxAttributes;
64 38
65#define PropBlackboxHintsElements (5) 39#define PropBlackboxHintsElements (5)
66#define PropBlackboxAttributesElements (8) 40#define PropBlackboxAttributesElements (8)
@@ -77,6 +51,29 @@ class BaseDisplay {
77public: 51public:
78 BaseDisplay(char *, char * = 0); 52 BaseDisplay(char *, char * = 0);
79 virtual ~BaseDisplay(void); 53 virtual ~BaseDisplay(void);
54
55 enum Attrib {
56 ATTRIB_SHADED = 0x01,
57 ATTRIB_MAXHORIZ = 0x02,
58 ATTRIB_MAXVERT = 0x04,
59 ATTRIB_OMNIPRESENT = 0x08,
60 ATTRIB_WORKSPACE = 0x10,
61 ATTRIB_STACK = 0x20,
62 ATTRIB_DECORATION = 0x40
63 };
64 enum Decor {DECOR_NONE=0, DECOR_NORMAL, DECOR_TINY, DECOR_TOOL};
65 enum Stack {STACK_TOP=0, STACK_NORMAL, STACK_BOTTOM};
66
67 typedef struct _blackbox_hints {
68 unsigned long flags, attrib, workspace, stack;
69 Decor decoration;
70 } BlackboxHints;
71
72 typedef struct _blackbox_attributes {
73 unsigned long flags, attrib, workspace, stack;
74 int premax_x, premax_y;
75 unsigned int premax_w, premax_h;
76 } BlackboxAttributes;
80 77
81#ifdef GNOME 78#ifdef GNOME
82 inline Atom *getGnomeListAtoms() { return gnome_atom_list; } 79 inline Atom *getGnomeListAtoms() { return gnome_atom_list; }