summaryrefslogtreecommitdiff
path: root/include/compiz.h
diff options
context:
space:
mode:
authorMike Dransfield <mike@blueroot.co.uk>2007-06-01 11:42:28 +0100
committerMike Dransfield <mike@blueroot.co.uk>2007-06-01 11:42:28 +0100
commit0e01bec891a6e5d1ed6293f003c34e0ee97f9b22 (patch)
tree09d2525dd3253ada569084f08650be05f792632a /include/compiz.h
parentfe799b54040e53294a469fb1a12874676c69130c (diff)
parent22481bc09476cb0d9271f119eb9e8ef7a10fbc1e (diff)
downloadcompiz-core-doc-0e01bec891a6e5d1ed6293f003c34e0ee97f9b22.tar.gz
compiz-core-doc-0e01bec891a6e5d1ed6293f003c34e0ee97f9b22.tar.bz2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz
Diffstat (limited to 'include/compiz.h')
-rw-r--r--include/compiz.h51
1 files changed, 34 insertions, 17 deletions
diff --git a/include/compiz.h b/include/compiz.h
index f0f2eb9..cc755ef 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -26,7 +26,7 @@
#ifndef _COMPIZ_H
#define _COMPIZ_H
-#define ABIVERSION 20070524
+#define ABIVERSION 20070602
#include <stdio.h>
#include <sys/time.h>
@@ -89,6 +89,7 @@ typedef struct _FragmentAttrib FragmentAttrib;
typedef struct _CompCursor CompCursor;
typedef struct _CompMatch CompMatch;
typedef struct _CompMetadata CompMetadata;
+typedef struct _CompOutput CompOutput;
/* virtual modifiers */
@@ -1209,24 +1210,29 @@ typedef void (*DonePaintScreenProc) (CompScreen *screen);
#define PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK (1 << 3)
#define PAINT_SCREEN_CLEAR_MASK (1 << 4)
-typedef Bool (*PaintScreenProc) (CompScreen *screen,
+typedef void (*PaintScreenProc) (CompScreen *screen,
+ CompOutput *outputs,
+ int numOutput,
+ unsigned int mask);
+
+typedef Bool (*PaintOutputProc) (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Region region,
- int output,
+ CompOutput *output,
unsigned int mask);
-typedef void (*PaintTransformedScreenProc) (CompScreen *screen,
+typedef void (*PaintTransformedOutputProc) (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Region region,
- int output,
+ CompOutput *output,
unsigned int mask);
/* XXX: ApplyScreenTransformProc will be removed */
typedef void (*ApplyScreenTransformProc) (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
- int output,
+ CompOutput *output,
CompTransform *transform);
/*
@@ -1319,37 +1325,43 @@ donePaintScreen (CompScreen *screen);
void
transformToScreenSpace (CompScreen *screen,
- int output,
+ CompOutput *output,
float z,
CompTransform *transform);
/* XXX: prepareXCoords will be removed */
void
prepareXCoords (CompScreen *screen,
- int output,
+ CompOutput *output,
float z);
void
-paintTransformedScreen (CompScreen *screen,
+paintTransformedOutput (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Region region,
- int output,
+ CompOutput *output,
unsigned int mask);
/* XXX: applyScreenTransform will be removed */
void
applyScreenTransform (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
- int output,
+ CompOutput *output,
CompTransform *transform);
+void
+paintScreen (CompScreen *screen,
+ CompOutput *outputs,
+ int numOutput,
+ unsigned int mask);
+
Bool
-paintScreen (CompScreen *screen,
+paintOutput (CompScreen *screen,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Region region,
- int output,
+ CompOutput *output,
unsigned int mask);
Bool
@@ -1766,13 +1778,14 @@ struct _CompIcon {
int height;
};
-typedef struct _CompOutput {
+struct _CompOutput {
char *name;
+ int id;
REGION region;
int width;
int height;
XRectangle workArea;
-} CompOutput;
+};
typedef struct _CompCursorImage {
struct _CompCursorImage *next;
@@ -1859,6 +1872,9 @@ struct _CompScreen {
CompOutput *outputDev;
int nOutputDev;
int currentOutputDev;
+ CompOutput fullscreenOutput;
+
+ XRectangle lastViewport;
CompActiveWindowHistory history[ACTIVE_WINDOW_HISTORY_NUM];
int currentHistory;
@@ -1976,7 +1992,8 @@ struct _CompScreen {
PreparePaintScreenProc preparePaintScreen;
DonePaintScreenProc donePaintScreen;
PaintScreenProc paintScreen;
- PaintTransformedScreenProc paintTransformedScreen;
+ PaintOutputProc paintOutput;
+ PaintTransformedOutputProc paintTransformedOutput;
ApplyScreenTransformProc applyScreenTransform;
PaintBackgroundProc paintBackground;
PaintWindowProc paintWindow;
@@ -2220,7 +2237,7 @@ outputChangeNotify (CompScreen *s);
void
clearScreenOutput (CompScreen *s,
- int output,
+ CompOutput *output,
unsigned int mask);
void