summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-10-09 22:55:44 +0200
committerDennis kasprzyk <onestone@compiz-fusion.org>2008-10-09 22:55:44 +0200
commitc859b0880cc4c40f7aa96583ac382e6522efaf7d (patch)
tree6d2924fde03ca1a064d62727cd9e63e93a7341a8
parent7ca797b4821519ff1fa4e48cdeaa7afd75099280 (diff)
downloadcompiz-with-glib-mainloop-c859b0880cc4c40f7aa96583ac382e6522efaf7d.tar.gz
compiz-with-glib-mainloop-c859b0880cc4c40f7aa96583ac382e6522efaf7d.tar.bz2
Cleanups.
-rw-r--r--include/composite/composite.h64
-rw-r--r--include/core/screen.h16
-rw-r--r--include/core/window.h60
-rw-r--r--include/opengl/opengl.h4
4 files changed, 68 insertions, 76 deletions
diff --git a/include/composite/composite.h b/include/composite/composite.h
index d25bc47..436e7af 100644
--- a/include/composite/composite.h
+++ b/include/composite/composite.h
@@ -13,6 +13,20 @@
#define COMPOSITE_SCREEN_DAMAGE_REGION_MASK (1 << 1)
#define COMPOSITE_SCREEN_DAMAGE_ALL_MASK (1 << 2)
+#define OPAQUE 0xffff
+#define COLOR 0xffff
+#define BRIGHT 0xffff
+
+#define PAINT_SCREEN_REGION_MASK (1 << 0)
+#define PAINT_SCREEN_FULL_MASK (1 << 1)
+#define PAINT_SCREEN_TRANSFORMED_MASK (1 << 2)
+#define PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK (1 << 3)
+#define PAINT_SCREEN_CLEAR_MASK (1 << 4)
+#define PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK (1 << 5)
+#define PAINT_SCREEN_NO_BACKGROUND_MASK (1 << 6)
+
+
+
class PrivateCompositeScreen;
class PrivateCompositeWindow;
class CompositeScreen;
@@ -109,6 +123,56 @@ class CompositeScreen :
CompOption::Vector &options);
};
+/*
+ window paint flags
+
+ bit 1-16 are used for read-only flags and they provide
+ information that describe the screen rendering pass
+ currently in process.
+
+ bit 17-32 are writable flags and they provide information
+ that is used to optimize rendering.
+*/
+
+/*
+ this flag is present when window is being painted
+ on a transformed screen.
+*/
+#define PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK (1 << 0)
+
+/*
+ this flag is present when window is being tested
+ for occlusion of other windows.
+*/
+#define PAINT_WINDOW_OCCLUSION_DETECTION_MASK (1 << 1)
+
+/*
+ this flag indicates that the window ist painted with
+ an offset
+*/
+#define PAINT_WINDOW_WITH_OFFSET_MASK (1 << 2)
+
+/*
+ flag indicate that window is translucent.
+*/
+#define PAINT_WINDOW_TRANSLUCENT_MASK (1 << 16)
+
+/*
+ flag indicate that window is transformed.
+*/
+#define PAINT_WINDOW_TRANSFORMED_MASK (1 << 17)
+
+/*
+ flag indicate that core PaintWindow function should
+ not draw this window.
+*/
+#define PAINT_WINDOW_NO_CORE_INSTANCE_MASK (1 << 18)
+
+/*
+ flag indicate that blending is required.
+*/
+#define PAINT_WINDOW_BLEND_MASK (1 << 19)
+
class CompositeWindowInterface :
public WrapableInterface<CompositeWindow, CompositeWindowInterface>
{
diff --git a/include/core/screen.h b/include/core/screen.h
index 9d1a4be..bb842b4 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -46,22 +46,6 @@ struct CompFileWatch {
CompFileWatchHandle handle;
};
-/* camera distance from screen, 0.5 * tan (FOV) */
-#define DEFAULT_Z_CAMERA 0.866025404f
-
-#define OPAQUE 0xffff
-#define COLOR 0xffff
-#define BRIGHT 0xffff
-
-#define PAINT_SCREEN_REGION_MASK (1 << 0)
-#define PAINT_SCREEN_FULL_MASK (1 << 1)
-#define PAINT_SCREEN_TRANSFORMED_MASK (1 << 2)
-#define PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK (1 << 3)
-#define PAINT_SCREEN_CLEAR_MASK (1 << 4)
-#define PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK (1 << 5)
-#define PAINT_SCREEN_NO_BACKGROUND_MASK (1 << 6)
-
-
#define ACTIVE_WINDOW_HISTORY_SIZE 64
#define ACTIVE_WINDOW_HISTORY_NUM 32
diff --git a/include/core/window.h b/include/core/window.h
index 6beb6d9..f31737d 100644
--- a/include/core/window.h
+++ b/include/core/window.h
@@ -24,9 +24,6 @@ class CompIcon;
class PrivateWindow;
struct CompStartupSequence;
-#define GET_CORE_WINDOW(object) (dynamic_cast<CompWindow *> (object))
-#define CORE_WINDOW(object) CompWindow *w = GET_CORE_WINDOW (object)
-
#define ROOTPARENT(x) (((x)->frame ()) ? (x)->frame () : (x)->id ())
#define CompWindowProtocolDeleteMask (1 << 0)
@@ -125,63 +122,12 @@ struct CompStartupSequence;
#define ClientTypeApplication 1
#define ClientTypePager 2
-/*
- window paint flags
-
- bit 1-16 are used for read-only flags and they provide
- information that describe the screen rendering pass
- currently in process.
-
- bit 17-32 are writable flags and they provide information
- that is used to optimize rendering.
-*/
-
-/*
- this flag is present when window is being painted
- on a transformed screen.
-*/
-#define PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK (1 << 0)
-
-/*
- this flag is present when window is being tested
- for occlusion of other windows.
-*/
-#define PAINT_WINDOW_OCCLUSION_DETECTION_MASK (1 << 1)
-
-/*
- this flag indicates that the window ist painted with
- an offset
-*/
-#define PAINT_WINDOW_WITH_OFFSET_MASK (1 << 2)
-
-/*
- flag indicate that window is translucent.
-*/
-#define PAINT_WINDOW_TRANSLUCENT_MASK (1 << 16)
-
-/*
- flag indicate that window is transformed.
-*/
-#define PAINT_WINDOW_TRANSFORMED_MASK (1 << 17)
-
-/*
- flag indicate that core PaintWindow function should
- not draw this window.
-*/
-#define PAINT_WINDOW_NO_CORE_INSTANCE_MASK (1 << 18)
-
-/*
- flag indicate that blending is required.
-*/
-#define PAINT_WINDOW_BLEND_MASK (1 << 19)
-
#define CompWindowGrabKeyMask (1 << 0)
#define CompWindowGrabButtonMask (1 << 1)
#define CompWindowGrabMoveMask (1 << 2)
#define CompWindowGrabResizeMask (1 << 3)
-
enum CompStackingUpdateMode {
CompStackingUpdateModeNone = 0,
CompStackingUpdateModeNormal,
@@ -306,7 +252,6 @@ class CompWindow :
void close (Time serverTime);
-
bool inShowDesktopMode ();
void setShowDesktopMode (bool);
@@ -333,8 +278,7 @@ class CompWindow :
Window clientLeader ();
- void
- changeState (unsigned int newState);
+ void changeState (unsigned int newState);
void recalcActions ();
@@ -493,8 +437,6 @@ class CompWindow :
private:
PrivateWindow *priv;
-
-
};
#endif
diff --git a/include/opengl/opengl.h b/include/opengl/opengl.h
index 2666b6d..741e418 100644
--- a/include/opengl/opengl.h
+++ b/include/opengl/opengl.h
@@ -10,9 +10,11 @@
#define COMPIZ_OPENGL_ABI 1
-#define PLUGIN OpenGL
#include <core/privatehandler.h>
+/* camera distance from screen, 0.5 * tan (FOV) */
+#define DEFAULT_Z_CAMERA 0.866025404f
+
class PrivateGLScreen;
class PrivateGLWindow;