summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-08-20 17:05:03 +0200
committerDennis kasprzyk <onestone@compiz-fusion.org>2008-08-20 17:05:03 +0200
commitccdead1b746aecaaeb9f4aa2046a5d70083e5f1f (patch)
treef7f4337b61a09a7f30962cb6c9aad99230cdc601
parent6c1c6625d345d5beecc7051b5eca526f97932f2b (diff)
downloadmobileperf-ccdead1b746aecaaeb9f4aa2046a5d70083e5f1f.tar.gz
mobileperf-ccdead1b746aecaaeb9f4aa2046a5d70083e5f1f.tar.bz2
Renamed WindowPaintAttrib to CompWindowPaintAttrib.
-rw-r--r--include/compfragment.h4
-rw-r--r--include/compiz-core.h24
-rw-r--r--include/compwindow.h32
-rw-r--r--src/fragment.cpp2
-rw-r--r--src/paint.cpp10
-rw-r--r--src/privatewindow.h4
-rw-r--r--src/window.cpp10
7 files changed, 43 insertions, 43 deletions
diff --git a/include/compfragment.h b/include/compfragment.h
index dad6f62..fdeda74 100644
--- a/include/compfragment.h
+++ b/include/compfragment.h
@@ -7,7 +7,7 @@
#define COMP_FETCH_TARGET_RECT 1
#define COMP_FETCH_TARGET_NUM 2
-struct WindowPaintAttrib;
+struct CompWindowPaintAttrib;
namespace CompFragment {
@@ -48,7 +48,7 @@ namespace CompFragment {
class Attrib {
public:
- Attrib (const WindowPaintAttrib *paint);
+ Attrib (const CompWindowPaintAttrib *paint);
Attrib (const Attrib&);
~Attrib ();
diff --git a/include/compiz-core.h b/include/compiz-core.h
index 28eabe5..910b91c 100644
--- a/include/compiz-core.h
+++ b/include/compiz-core.h
@@ -79,7 +79,7 @@
class CompTexture;
class CompIcon;
-typedef struct _CompWindowExtents CompWindowExtents;
+//typedef struct _CompWindowExtents CompWindowExtents;
class CompMatch;
class CompOutput;
typedef struct _CompWalker CompWalker;
@@ -334,28 +334,6 @@ typedef struct _CompActiveWindowHistory {
/* window.c */
-typedef enum {
- CompStackingUpdateModeNone = 0,
- CompStackingUpdateModeNormal,
- CompStackingUpdateModeAboveFullscreen,
- CompStackingUpdateModeInitialMap,
- CompStackingUpdateModeInitialMapDeniedFocus
-} CompStackingUpdateMode;
-
-struct _CompWindowExtents {
- int left;
- int right;
- int top;
- int bottom;
-};
-
-typedef struct _CompStruts {
- XRectangle left;
- XRectangle right;
- XRectangle top;
- XRectangle bottom;
-} CompStruts;
-
/* plugin.c */
diff --git a/include/compwindow.h b/include/compwindow.h
index 625ff91..19cf159 100644
--- a/include/compwindow.h
+++ b/include/compwindow.h
@@ -158,7 +158,7 @@ class PrivateWindow;
#define CompWindowGrabMoveMask (1 << 2)
#define CompWindowGrabResizeMask (1 << 3)
-struct WindowPaintAttrib {
+struct CompWindowPaintAttrib {
GLushort opacity;
GLushort brightness;
GLushort saturation;
@@ -168,13 +168,33 @@ struct WindowPaintAttrib {
GLfloat yTranslate;
};
-extern WindowPaintAttrib defaultWindowPaintAttrib;
+enum CompStackingUpdateMode {
+ CompStackingUpdateModeNone = 0,
+ CompStackingUpdateModeNormal,
+ CompStackingUpdateModeAboveFullscreen,
+ CompStackingUpdateModeInitialMap,
+ CompStackingUpdateModeInitialMapDeniedFocus
+};
+
+struct CompWindowExtents {
+ int left;
+ int right;
+ int top;
+ int bottom;
+};
+
+struct CompStruts {
+ XRectangle left;
+ XRectangle right;
+ XRectangle top;
+ XRectangle bottom;
+};
class WindowInterface : public WrapableInterface<CompWindow> {
public:
WindowInterface ();
- WRAPABLE_DEF(bool, paint, const WindowPaintAttrib *,
+ WRAPABLE_DEF(bool, paint, const CompWindowPaintAttrib *,
const CompTransform *, Region, unsigned int);
WRAPABLE_DEF(bool, draw, const CompTransform *,
CompFragment::Attrib &, Region, unsigned int);
@@ -223,6 +243,8 @@ class CompWindow : public WrapableHandler<WindowInterface>, public CompObject {
private:
unsigned int mBorder;
};
+
+ static CompWindowPaintAttrib defaultPaintAttrib;
public:
CompWindow *next;
@@ -594,7 +616,7 @@ class CompWindow : public WrapableHandler<WindowInterface>, public CompObject {
Region
clip ();
- WindowPaintAttrib &
+ CompWindowPaintAttrib &
paintAttrib ();
bool
@@ -617,7 +639,7 @@ class CompWindow : public WrapableHandler<WindowInterface>, public CompObject {
static int allocPrivateIndex ();
static void freePrivateIndex (int index);
- WRAPABLE_HND(bool, paint, const WindowPaintAttrib *,
+ WRAPABLE_HND(bool, paint, const CompWindowPaintAttrib *,
const CompTransform *, Region, unsigned int);
WRAPABLE_HND(bool, draw, const CompTransform *,
CompFragment::Attrib &, Region, unsigned int);
diff --git a/src/fragment.cpp b/src/fragment.cpp
index cc0d390..dcda2bf 100644
--- a/src/fragment.cpp
+++ b/src/fragment.cpp
@@ -845,7 +845,7 @@ namespace CompFragment {
return function->id;
}
- Attrib::Attrib (const WindowPaintAttrib *paint) :
+ Attrib::Attrib (const CompWindowPaintAttrib *paint) :
priv (new PrivateAttrib ())
{
priv->opacity = paint->opacity;
diff --git a/src/paint.cpp b/src/paint.cpp
index f9801fd..13d92e1 100644
--- a/src/paint.cpp
+++ b/src/paint.cpp
@@ -36,7 +36,7 @@ ScreenPaintAttrib defaultScreenPaintAttrib = {
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -DEFAULT_Z_CAMERA
};
-WindowPaintAttrib defaultWindowPaintAttrib = {
+CompWindowPaintAttrib defaultWindowPaintAttrib = {
OPAQUE, BRIGHT, COLOR, 1.0f, 1.0f, 0.0f, 0.0f
};
@@ -1133,10 +1133,10 @@ CompWindow::draw (const CompTransform *transform,
}
bool
-CompWindow::paint (const WindowPaintAttrib *attrib,
- const CompTransform *transform,
- Region region,
- unsigned int mask)
+CompWindow::paint (const CompWindowPaintAttrib *attrib,
+ const CompTransform *transform,
+ Region region,
+ unsigned int mask)
{
WRAPABLE_HND_FUNC_RETURN(bool, paint, attrib, transform, region, mask)
diff --git a/src/privatewindow.h b/src/privatewindow.h
index cc3df8b..a2857f6 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -209,8 +209,8 @@ class PrivateWindow {
GLushort brightness;
GLushort saturation;
- WindowPaintAttrib paint;
- WindowPaintAttrib lastPaint;
+ CompWindowPaintAttrib paint;
+ CompWindowPaintAttrib lastPaint;
unsigned int lastMask;
diff --git a/src/window.cpp b/src/window.cpp
index b103388..5279812 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4172,10 +4172,10 @@ WindowInterface::WindowInterface ()
bool
-WindowInterface::paint (const WindowPaintAttrib *attrib,
- const CompTransform *transform,
- Region region,
- unsigned int mask)
+WindowInterface::paint (const CompWindowPaintAttrib *attrib,
+ const CompTransform *transform,
+ Region region,
+ unsigned int mask)
WRAPABLE_DEF_FUNC_RETURN(paint, attrib, transform, region, mask)
bool
@@ -4858,7 +4858,7 @@ CompWindow::clip ()
return priv->clip;
}
-WindowPaintAttrib &
+CompWindowPaintAttrib &
CompWindow::paintAttrib ()
{
return priv->paint;