summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-02-01 23:01:04 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-02-01 23:01:04 +0800
commitbd14afde58b743a1a9ba94b98dd1e107c841ca06 (patch)
treeec556f22663bc87e6b99d47de98e153e398cfd3d /include
parentff085dc57497c0c0d5a87b0864cf09d5b7e5ff59 (diff)
parent4ae95852e53075caed1558620127f0c1405fe474 (diff)
downloadmobileperf-bd14afde58b743a1a9ba94b98dd1e107c841ca06.tar.gz
mobileperf-bd14afde58b743a1a9ba94b98dd1e107c841ca06.tar.bz2
Merge branch 'master' of ../../../core
Conflicts: include/core/core.h src/window.cpp
Diffstat (limited to 'include')
-rw-r--r--include/core/core.h3
-rw-r--r--include/core/screen.h2
-rw-r--r--include/core/window.h11
-rw-r--r--include/decoration.h10
4 files changed, 17 insertions, 9 deletions
diff --git a/include/core/core.h b/include/core/core.h
index b1b00a3..b0b86b3 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -26,7 +26,8 @@
#ifndef _COMPIZ_CORE_H
#define _COMPIZ_CORE_H
-#define CORE_ABIVERSION 20110113
+
+#define CORE_ABIVERSION 20110131
#include <stdio.h>
#include <assert.h>
diff --git a/include/core/screen.h b/include/core/screen.h
index cd8c86d..f9652f1 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -55,8 +55,10 @@ extern ModifierHandler *modHandler;
extern int lastPointerX;
extern int lastPointerY;
+extern unsigned int lastPointerMods;
extern int pointerX;
extern int pointerY;
+extern unsigned int pointerMods;
#define NOTIFY_CREATE_MASK (1 << 0)
#define NOTIFY_DELETE_MASK (1 << 1)
diff --git a/include/core/window.h b/include/core/window.h
index 08b6e68..a6e4b4a 100644
--- a/include/core/window.h
+++ b/include/core/window.h
@@ -343,7 +343,8 @@ class CompWindow :
const CompRegion & frameRegion () const;
void updateFrameRegion ();
- void setWindowFrameExtents (CompWindowExtents *input);
+ void setWindowFrameExtents (CompWindowExtents *border,
+ CompWindowExtents *frame = NULL);
unsigned int & wmType ();
@@ -369,8 +370,6 @@ class CompWindow :
int mapNum () const;
- CompStruts * struts ();
-
int & saveMask ();
XWindowChanges & saveWc ();
@@ -513,6 +512,7 @@ class CompWindow :
static void freePluginClassIndex (unsigned int index);
bool updateStruts ();
+ CompStruts *struts ();
WRAPABLE_HND (0, WindowInterface, void, getOutputExtents,
CompWindowExtents&);
@@ -553,8 +553,9 @@ class CompWindow :
friend class CoreWindow;
private:
- CompWindow (Window aboveId,
- PrivateWindow *priv);
+ CompWindow (Window aboveId,
+ XWindowAttributes &wa,
+ PrivateWindow *priv);
PrivateWindow *priv;
};
diff --git a/include/decoration.h b/include/decoration.h
index 8e26e85..b0c731b 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -175,7 +175,7 @@ typedef void (*decor_draw_func_t) (Display *xdisplay,
void *closure);
#define WINDOW_PROP_SIZE 12
-#define BASE_PROP_SIZE 13
+#define BASE_PROP_SIZE 21
#define QUAD_PROP_SIZE 9
#define N_QUADS_MAX 24
@@ -185,7 +185,9 @@ decor_version (void);
void
decor_quads_to_property (long *data,
Pixmap pixmap,
+ decor_extents_t *frame_input,
decor_extents_t *input,
+ decor_extents_t *frame_max_input,
decor_extents_t *max_input,
int min_width,
int min_height,
@@ -209,8 +211,10 @@ int
decor_pixmap_property_to_quads (long *data,
int size,
Pixmap *pixmap,
- decor_extents_t *input,
- decor_extents_t *max_input,
+ decor_extents_t *frame_input,
+ decor_extents_t *input,
+ decor_extents_t *frame_max_input,
+ decor_extents_t *max_input,
int *min_width,
int *min_height,
decor_quad_t *quad);