summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@XPS-SUSE.site>2009-03-19 14:00:38 +0900
committerSam Spilsbury <Sam@XPS-SUSE.site>2009-03-19 14:00:38 +0900
commit65449d300b17d516edf442b2ee4afa409f8784e9 (patch)
treeac6236508864b8e5d99053c000b3a9e604b3deb8
parent5b14325ab58cf7f526a8285c17b3fc5b6e1cab38 (diff)
downloadcompiz-mpx-ir-65449d300b17d516edf442b2ee4afa409f8784e9.tar.gz
compiz-mpx-ir-65449d300b17d516edf442b2ee4afa409f8784e9.tar.bz2
Update patches for compiz-0.8.x
-rw-r--r--compiz/0001-X-Input-2-Support-in-Core.patch55
-rw-r--r--compiz/0002-MPX-Support-in-plugins.patch14
-rw-r--r--compiz/0003-Input-Redirection-Support-in-Core.patch134
-rw-r--r--compiz/0004-Input-Redirection-Support-in-Plugins.patch8
4 files changed, 89 insertions, 122 deletions
diff --git a/compiz/0001-X-Input-2-Support-in-Core.patch b/compiz/0001-X-Input-2-Support-in-Core.patch
index 21c9ef4..6a22494 100644
--- a/compiz/0001-X-Input-2-Support-in-Core.patch
+++ b/compiz/0001-X-Input-2-Support-in-Core.patch
@@ -1,23 +1,23 @@
-From e8291d43a83d679aab656890999766fb1c045db5 Mon Sep 17 00:00:00 2001
+From 8a6f297b6e2a2211aa108e64b49e8bb07ca4c776 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
-Date: Sun, 30 Nov 2008 22:17:17 +0900
-Subject: [PATCH] X Input 2 Support in Core
+Date: Thu, 19 Mar 2009 13:53:19 +0900
+Subject: [PATCH] X-Input 2 Support in Core
---
configure.ac | 2 +
- include/compiz-core.h | 83 +++++++++++++
+ include/compiz-core.h | 84 +++++++++++++
include/compiz-scale.h | 12 ++-
src/Makefile.am | 3 +-
src/display.c | 68 +++++++++++-
src/event.c | 304 ++++++++++++++++++++++++++++++++++++++++++------
src/window.c | 41 ++++++-
- 7 files changed, 471 insertions(+), 42 deletions(-)
+ 7 files changed, 472 insertions(+), 42 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 4532099..bbfdb77 100644
+index 8663ead..bbcf1f4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -124,10 +124,12 @@ COMPIZ_REQUIRES="x11-xcb \
+@@ -123,10 +123,12 @@ COMPIZ_REQUIRES="xcomposite \
xdamage \
xrandr \
xinerama \
@@ -31,10 +31,10 @@ index 4532099..bbfdb77 100644
PKG_CHECK_MODULES(COMPIZ, $COMPIZ_REQUIRES)
diff --git a/include/compiz-core.h b/include/compiz-core.h
-index 5aeb04c..709f2ac 100644
+index 05409f5..2306ba3 100644
--- a/include/compiz-core.h
+++ b/include/compiz-core.h
-@@ -38,6 +38,7 @@
+@@ -37,6 +37,7 @@
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xinerama.h>
@@ -50,10 +50,10 @@ index 5aeb04c..709f2ac 100644
/* virtual modifiers */
-@@ -1091,6 +1093,19 @@ struct _CompDisplay {
- MatchPropertyChangedProc matchPropertyChanged;
+@@ -690,6 +692,20 @@ struct _CompCore {
- LogMessageProc logMessage;
+ SessionEventProc sessionEvent;
+ LogMessageProc logMessage;
+
+ /* XInput devices and event types*/
+ CompDevice *devices;
@@ -67,10 +67,11 @@ index 5aeb04c..709f2ac 100644
+ int xi_leave;
+ int xi_focusin;
+ int xi_focusout;
++
};
- #define GET_CORE_DISPLAY(object) ((CompDisplay *) (object))
-@@ -3492,6 +3507,74 @@ compReadXmlChunkFromMetadataOptionInfo (const CompMetadataOptionInfo *info,
+ int
+@@ -3477,6 +3493,74 @@ compReadXmlChunkFromMetadataOptionInfo (const CompMetadataOptionInfo *info,
char *buffer,
int length);
@@ -194,7 +195,7 @@ index 683d695..8505f7b 100644
+ metadata.c \
+ devices.c
diff --git a/src/display.c b/src/display.c
-index dd4676e..5cd29ad 100644
+index caf63d4..2ccd3e4 100644
--- a/src/display.c
+++ b/src/display.c
@@ -52,7 +52,7 @@ static unsigned int virtualModMask[] = {
@@ -206,7 +207,7 @@ index dd4676e..5cd29ad 100644
static const CompTransform identity = {
{
-@@ -1477,6 +1477,7 @@ eventLoop (void)
+@@ -1306,6 +1306,7 @@ eventLoop (void)
CompScreen *s;
CompWindow *w;
CompTimeout *t;
@@ -214,7 +215,7 @@ index dd4676e..5cd29ad 100644
int time, timeToNextRedraw = 0;
unsigned int damageMask, mask;
-@@ -1498,6 +1499,8 @@ eventLoop (void)
+@@ -1327,6 +1328,8 @@ eventLoop (void)
{
XNextEvent (d->display, &event);
@@ -223,7 +224,7 @@ index dd4676e..5cd29ad 100644
switch (event.type) {
case ButtonPress:
case ButtonRelease:
-@@ -1525,6 +1528,43 @@ eventLoop (void)
+@@ -1354,6 +1357,43 @@ eventLoop (void)
pointerY = event.xclient.data.l[2] & 0xffff;
}
default:
@@ -267,7 +268,7 @@ index dd4676e..5cd29ad 100644
break;
}
-@@ -1536,8 +1576,22 @@ eventLoop (void)
+@@ -1365,8 +1405,22 @@ eventLoop (void)
inHandleEvent = FALSE;
@@ -290,7 +291,7 @@ index dd4676e..5cd29ad 100644
}
}
-@@ -2296,6 +2350,8 @@ addDisplay (const char *name)
+@@ -2122,6 +2176,8 @@ addDisplay (const char *name)
addDisplayToCore (d);
@@ -299,7 +300,7 @@ index dd4676e..5cd29ad 100644
/* TODO: bailout properly when objectInitPlugins fails */
assert (objectInitPlugins (&d->base));
-@@ -2459,6 +2515,16 @@ addDisplay (const char *name)
+@@ -2285,6 +2341,16 @@ addDisplay (const char *name)
XGrabServer (dpy);
@@ -317,7 +318,7 @@ index dd4676e..5cd29ad 100644
SubstructureRedirectMask |
SubstructureNotifyMask |
diff --git a/src/event.c b/src/event.c
-index 1f34243..4dbcc1b 100644
+index 7e08e3c..d395738 100644
--- a/src/event.c
+++ b/src/event.c
@@ -207,13 +207,20 @@ isCallBackBinding (CompOption *option,
@@ -805,7 +806,7 @@ index 1f34243..4dbcc1b 100644
moveInputFocusToOtherWindow (w);
-@@ -2342,6 +2542,7 @@ handleEvent (CompDisplay *d,
+@@ -2360,6 +2560,7 @@ handleEvent (CompDisplay *d,
break;
}
@@ -813,7 +814,7 @@ index 1f34243..4dbcc1b 100644
if (w)
{
handleSyncAlarm (w);
-@@ -2350,6 +2551,39 @@ handleEvent (CompDisplay *d,
+@@ -2368,6 +2569,39 @@ handleEvent (CompDisplay *d,
break;
}
}
@@ -854,10 +855,10 @@ index 1f34243..4dbcc1b 100644
break;
}
diff --git a/src/window.c b/src/window.c
-index 0a217d2..cffdc9f 100644
+index 8a5df8b..f5a019f 100644
--- a/src/window.c
+++ b/src/window.c
-@@ -2117,9 +2117,26 @@ addWindow (CompScreen *screen,
+@@ -2169,9 +2169,26 @@ addWindow (CompScreen *screen,
w->id = id;
@@ -887,7 +888,7 @@ index 0a217d2..cffdc9f 100644
w->inputHint = TRUE;
w->alpha = (w->attrib.depth == 32);
-@@ -2328,7 +2345,23 @@ removeWindow (CompWindow *w)
+@@ -2380,7 +2397,23 @@ removeWindow (CompWindow *w)
XSelectInput (d->display, w->id, NoEventMask);
diff --git a/compiz/0002-MPX-Support-in-plugins.patch b/compiz/0002-MPX-Support-in-plugins.patch
index b0dd2d9..2a7b9a7 100644
--- a/compiz/0002-MPX-Support-in-plugins.patch
+++ b/compiz/0002-MPX-Support-in-plugins.patch
@@ -1,6 +1,6 @@
-From 1dec1de1786f21dc84deae0b919c9df2b6075534 Mon Sep 17 00:00:00 2001
+From 0c5827d321586f541295928f0db9799bc1c503b9 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
-Date: Wed, 10 Dec 2008 17:36:09 +0900
+Date: Thu, 19 Mar 2009 13:54:09 +0900
Subject: [PATCH] MPX Support in plugins
---
@@ -78,7 +78,7 @@ index 118c27d..b09b53e 100644
ScaleType type;
diff --git a/plugins/annotate.c b/plugins/annotate.c
-index 6271260..4827bcf 100644
+index fea72d3..e5c870a 100644
--- a/plugins/annotate.c
+++ b/plugins/annotate.c
@@ -34,9 +34,6 @@ static CompMetadata annoMetadata;
@@ -443,7 +443,7 @@ index 6271260..4827bcf 100644
as->pixmap = None;
as->cairo = NULL;
diff --git a/plugins/move.c b/plugins/move.c
-index 1a4bbda..014d4d1 100644
+index 2255fd8..6f73c0e 100644
--- a/plugins/move.c
+++ b/plugins/move.c
@@ -28,6 +28,7 @@
@@ -1244,7 +1244,7 @@ index 1a4bbda..014d4d1 100644
WRAP (ms, s, paintWindow, movePaintWindow);
diff --git a/plugins/resize.c b/plugins/resize.c
-index 47d46eb..36dfd25 100644
+index 8943306..5bd4320 100644
--- a/plugins/resize.c
+++ b/plugins/resize.c
@@ -33,6 +33,7 @@
@@ -2714,7 +2714,7 @@ index 47d46eb..36dfd25 100644
rs->rightCursor = XCreateFontCursor (s->display->display, XC_right_side);
rs->upCursor = XCreateFontCursor (s->display->display,
diff --git a/plugins/scale.c b/plugins/scale.c
-index 45ba294..e9dde08 100644
+index 1063c9e..130359a 100644
--- a/plugins/scale.c
+++ b/plugins/scale.c
@@ -47,6 +47,13 @@ static int scaleDisplayPrivateIndex;
@@ -3485,7 +3485,7 @@ index 45ba294..e9dde08 100644
matchFini (&ss->match);
diff --git a/plugins/water.c b/plugins/water.c
-index ef2f191..38c8283 100644
+index 6b39d70..43c715a 100644
--- a/plugins/water.c
+++ b/plugins/water.c
@@ -49,6 +49,15 @@ typedef struct _WaterFunction {
diff --git a/compiz/0003-Input-Redirection-Support-in-Core.patch b/compiz/0003-Input-Redirection-Support-in-Core.patch
index ba36ea5..5277ad5 100644
--- a/compiz/0003-Input-Redirection-Support-in-Core.patch
+++ b/compiz/0003-Input-Redirection-Support-in-Core.patch
@@ -1,23 +1,23 @@
-From fe63963e04b392e70166fb6b98f28a8f30b36a67 Mon Sep 17 00:00:00 2001
+From 404af60217702405e77f74af0c8d019ca48899e2 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
-Date: Wed, 10 Dec 2008 17:37:01 +0900
+Date: Thu, 19 Mar 2009 13:58:14 +0900
Subject: [PATCH] Input Redirection Support in Core
---
- include/compiz-core.h | 131 ++++++++++++-----
+ include/compiz-core.h | 101 ++++++++-----
metadata/core.xml.in.in | 23 +++-
src/display.c | 47 ++++---
src/event.c | 378 +++++++++++++++++++++++++++++++++++++++++++++++
src/paint.c | 164 ++++++++++++++++++++
src/screen.c | 3 +
src/window.c | 14 ++
- 7 files changed, 703 insertions(+), 57 deletions(-)
+ 7 files changed, 673 insertions(+), 57 deletions(-)
diff --git a/include/compiz-core.h b/include/compiz-core.h
-index 709f2ac..fdc6ad3 100644
+index 2306ba3..1fbe2d3 100644
--- a/include/compiz-core.h
+++ b/include/compiz-core.h
-@@ -48,6 +48,7 @@
+@@ -47,6 +47,7 @@
#include <GL/gl.h>
#include <GL/glx.h>
@@ -35,19 +35,19 @@ index 709f2ac..fdc6ad3 100644
/* virtual modifiers */
-@@ -806,7 +809,10 @@ removeFileWatch (CompFileWatchHandle handle);
- #define COMP_DISPLAY_OPTION_RUN_TERMINAL_KEY 63
- #define COMP_DISPLAY_OPTION_PING_DELAY 64
- #define COMP_DISPLAY_OPTION_EDGE_DELAY 65
--#define COMP_DISPLAY_OPTION_NUM 66
-+#define COMP_DISPLAY_OPTION_MESH_MIN 66
-+#define COMP_DISPLAY_OPTION_MESH_MAX 67
-+#define COMP_DISPLAY_OPTION_REDIRECT_INPUT 68
-+#define COMP_DISPLAY_OPTION_NUM 69
+@@ -788,7 +791,10 @@ removeFileWatch (CompFileWatchHandle handle);
+ #define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED 31
+ #define COMP_DISPLAY_OPTION_PING_DELAY 32
+ #define COMP_DISPLAY_OPTION_EDGE_DELAY 33
+-#define COMP_DISPLAY_OPTION_NUM 34
++#define COMP_DISPLAY_OPTION_MESH_MIN 34
++#define COMP_DISPLAY_OPTION_MESH_MAX 35
++#define COMP_DISPLAY_OPTION_REDIRECT_INPUT 36
++#define COMP_DISPLAY_OPTION_NUM 37
typedef void (*HandleEventProc) (CompDisplay *display,
XEvent *event);
-@@ -1271,6 +1277,13 @@ findCursorAtDisplay (CompDisplay *display);
+@@ -1240,6 +1246,13 @@ findCursorAtDisplay (CompDisplay *display);
/* event.c */
@@ -61,7 +61,7 @@ index 709f2ac..fdc6ad3 100644
typedef struct _CompDelayedEdgeSettings
{
CompDisplay *d;
-@@ -1282,6 +1295,19 @@ typedef struct _CompDelayedEdgeSettings
+@@ -1251,6 +1264,19 @@ typedef struct _CompDelayedEdgeSettings
unsigned int nOption;
} CompDelayedEdgeSettings;
@@ -81,7 +81,7 @@ index 709f2ac..fdc6ad3 100644
void
handleEvent (CompDisplay *display,
XEvent *event);
-@@ -1310,6 +1336,32 @@ void
+@@ -1279,6 +1305,32 @@ void
clearTargetOutput (CompDisplay *display,
unsigned int mask);
@@ -114,7 +114,7 @@ index 709f2ac..fdc6ad3 100644
/* paint.c */
#define MULTIPLY_USHORT(us1, us2) \
-@@ -1320,9 +1372,9 @@ clearTargetOutput (CompDisplay *display,
+@@ -1289,9 +1341,9 @@ clearTargetOutput (CompDisplay *display,
#define DEG2RAD (M_PI / 180.0f)
@@ -126,7 +126,7 @@ index 709f2ac..fdc6ad3 100644
typedef union _CompVector {
float v[4];
-@@ -1459,7 +1511,7 @@ struct _CompWalker {
+@@ -1428,7 +1480,7 @@ struct _CompWalker {
#define PAINT_WINDOW_OCCLUSION_DETECTION_MASK (1 << 1)
/*
@@ -135,16 +135,16 @@ index 709f2ac..fdc6ad3 100644
an offset
*/
#define PAINT_WINDOW_WITH_OFFSET_MASK (1 << 2)
-@@ -2236,6 +2288,8 @@ struct _CompScreen {
- OutputChangeNotifyProc outputChangeNotify;
+@@ -2206,6 +2258,8 @@ struct _CompScreen {
InitWindowWalkerProc initWindowWalker;
-+
+
+ TransformMeshProc transformMesh;
++
+ void *reserved;
};
- #define GET_CORE_SCREEN(object) ((CompScreen *) (object))
-@@ -2695,10 +2749,46 @@ struct _CompWindow {
+@@ -2675,6 +2729,12 @@ struct _CompWindow {
int texCoordSize;
int indexCount;
@@ -156,42 +156,8 @@ index 709f2ac..fdc6ad3 100644
+
/* must be set by addWindowGeometry */
DrawWindowGeometryProc drawWindowGeometry;
- };
-
-+struct _CompDevice {
-+ XDevice *dev;
-+ int id;
-+ int use;
-+ int paired;
-+ XEventClass cls_btpress;
-+ XEventClass cls_btrelease;
-+ XEventClass cls_motion;
-+ XEventClass cls_enter;
-+ XEventClass cls_leave;
-+ XEventClass cls_kpress;
-+ XEventClass cls_krelease;
-+ XEventClass cls_focusin;
-+ XEventClass cls_focusout;
-+
-+ CompGrab *grabs;
-+ int grabSize;
-+ int maxGrab;
-+
-+ CompButtonGrab *buttonGrab;
-+ int nButtonGrab;
-+ CompKeyGrab *keyGrab;
-+ int nKeyGrab;
-+
-+ int pointerX;
-+ int pointerY;
-+ int lastPointerX;
-+ int lastPointerY;
-+};
-+
- #define GET_CORE_WINDOW(object) ((CompWindow *) (object))
- #define CORE_WINDOW(object) CompWindow *w = GET_CORE_WINDOW (object)
-@@ -3507,37 +3597,8 @@ compReadXmlChunkFromMetadataOptionInfo (const CompMetadataOptionInfo *info,
+@@ -3493,37 +3553,8 @@ compReadXmlChunkFromMetadataOptionInfo (const CompMetadataOptionInfo *info,
char *buffer,
int length);
@@ -230,7 +196,7 @@ index 709f2ac..fdc6ad3 100644
Bool
compInitDeviceList (CompDisplay *display);
-@@ -3574,8 +3635,6 @@ otherDeviceGrabExist (CompDevice *dev,
+@@ -3560,8 +3591,6 @@ otherDeviceGrabExist (CompDevice *dev,
void
compRegisterXIEvents(CompDisplay *d,
Window w);
@@ -240,7 +206,7 @@ index 709f2ac..fdc6ad3 100644
#endif
diff --git a/metadata/core.xml.in.in b/metadata/core.xml.in.in
-index 088cefe..42f4ea0 100644
+index 48073d7..73af919 100644
--- a/metadata/core.xml.in.in
+++ b/metadata/core.xml.in.in
@@ -89,7 +89,28 @@
@@ -274,12 +240,12 @@ index 088cefe..42f4ea0 100644
<_short>Key bindings</_short>
<option name="close_window_key" type="key">
diff --git a/src/display.c b/src/display.c
-index 5cd29ad..ed27986 100644
+index 2ccd3e4..7139f39 100644
--- a/src/display.c
+++ b/src/display.c
-@@ -681,7 +681,10 @@ const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
- { "command_terminal", "string", 0, 0, 0 },
- { "run_command_terminal_key", "key", 0, runCommandTerminal, 0 },
+@@ -510,7 +510,10 @@ const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
+ { "toggle_window_shaded_key", "key", 0, shade, 0 },
+ { "ignore_hints_when_maximized", "bool", 0, 0, 0 },
{ "ping_delay", "int", "<min>1000</min>", 0, 0 },
- { "edge_delay", "int", "<min>0</min>", 0, 0 }
+ { "edge_delay", "int", "<min>0</min>", 0, 0 },
@@ -289,7 +255,7 @@ index 5cd29ad..ed27986 100644
};
CompOption *
-@@ -1476,8 +1479,8 @@ eventLoop (void)
+@@ -1305,8 +1308,8 @@ eventLoop (void)
CompDisplay *d;
CompScreen *s;
CompWindow *w;
@@ -299,7 +265,7 @@ index 5cd29ad..ed27986 100644
int time, timeToNextRedraw = 0;
unsigned int damageMask, mask;
-@@ -1585,12 +1588,14 @@ eventLoop (void)
+@@ -1414,12 +1417,14 @@ eventLoop (void)
compRemoveDevice(d, pev->deviceid);
}
@@ -317,7 +283,7 @@ index 5cd29ad..ed27986 100644
}
}
}
-@@ -2065,6 +2070,8 @@ addDisplay (const char *name)
+@@ -1892,6 +1897,8 @@ addDisplay (const char *name)
snprintf (d->displayString, 255, "DISPLAY=%s", DisplayString (dpy));
@@ -326,7 +292,7 @@ index 5cd29ad..ed27986 100644
#ifdef DEBUG
XSynchronize (dpy, TRUE);
#endif
-@@ -2350,8 +2357,6 @@ addDisplay (const char *name)
+@@ -2176,8 +2183,6 @@ addDisplay (const char *name)
addDisplayToCore (d);
@@ -335,7 +301,7 @@ index 5cd29ad..ed27986 100644
/* TODO: bailout properly when objectInitPlugins fails */
assert (objectInitPlugins (&d->base));
-@@ -2525,19 +2530,21 @@ addDisplay (const char *name)
+@@ -2351,19 +2356,21 @@ addDisplay (const char *name)
ExposureMask);
compRegisterXIEvents(d, XRootWindow(dpy, i));
} else
@@ -371,7 +337,7 @@ index 5cd29ad..ed27986 100644
if (compCheckForError (dpy))
{
diff --git a/src/event.c b/src/event.c
-index 4dbcc1b..8702390 100644
+index d395738..bbc726f 100644
--- a/src/event.c
+++ b/src/event.c
@@ -25,6 +25,7 @@
@@ -382,7 +348,7 @@ index 4dbcc1b..8702390 100644
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-@@ -2588,3 +2589,380 @@ handleEvent (CompDisplay *d,
+@@ -2606,3 +2607,380 @@ handleEvent (CompDisplay *d,
break;
}
}
@@ -764,7 +730,7 @@ index 4dbcc1b..8702390 100644
+
+}
diff --git a/src/paint.c b/src/paint.c
-index 59be51f..138bd75 100644
+index 013cd10..4650eb8 100644
--- a/src/paint.c
+++ b/src/paint.c
@@ -29,6 +29,7 @@
@@ -959,10 +925,10 @@ index 59be51f..138bd75 100644
return status;
}
diff --git a/src/screen.c b/src/screen.c
-index 5a463b2..6384705 100644
+index acfaa6e..2aea268 100644
--- a/src/screen.c
+++ b/src/screen.c
-@@ -1796,6 +1796,8 @@ addScreen (CompDisplay *display,
+@@ -1805,6 +1805,8 @@ addScreen (CompDisplay *display,
s->initWindowWalker = initWindowWalker;
@@ -971,7 +937,7 @@ index 5a463b2..6384705 100644
s->getProcAddress = 0;
if (!XGetWindowAttributes (dpy, s->root, &s->attrib))
-@@ -2690,6 +2692,7 @@ pushScreenGrab (CompScreen *s,
+@@ -2699,6 +2701,7 @@ pushScreenGrab (CompScreen *s,
Cursor cursor,
const char *name)
{
@@ -980,10 +946,10 @@ index 5a463b2..6384705 100644
{
int status;
diff --git a/src/window.c b/src/window.c
-index cffdc9f..446c4cf 100644
+index f5a019f..317dd1d 100644
--- a/src/window.c
+++ b/src/window.c
-@@ -2110,6 +2110,12 @@ addWindow (CompScreen *screen,
+@@ -2162,6 +2162,12 @@ addWindow (CompScreen *screen,
w->saveMask = 0;
@@ -996,7 +962,7 @@ index cffdc9f..446c4cf 100644
XSelectInput (d->display, id,
PropertyChangeMask |
EnterWindowMask |
-@@ -2138,6 +2144,8 @@ addWindow (CompScreen *screen,
+@@ -2190,6 +2196,8 @@ addWindow (CompScreen *screen,
ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
GrabModeSync, GrabModeSync, None, None);
@@ -1005,7 +971,7 @@ index cffdc9f..446c4cf 100644
w->inputHint = TRUE;
w->alpha = (w->attrib.depth == 32);
w->wmType = 0;
-@@ -2305,6 +2313,8 @@ addWindow (CompScreen *screen,
+@@ -2357,6 +2365,8 @@ addWindow (CompScreen *screen,
(*core.objectAdd) (&screen->base, &w->base);
@@ -1014,7 +980,7 @@ index cffdc9f..446c4cf 100644
recalcWindowActions (w);
updateIconGeometry (w);
-@@ -2896,6 +2906,8 @@ syncWindowPosition (CompWindow *w)
+@@ -2948,6 +2958,8 @@ syncWindowPosition (CompWindow *w)
XMoveWindow (w->screen->display->display, w->frame,
w->serverX - w->input.left,
w->serverY - w->input.top);
@@ -1023,7 +989,7 @@ index cffdc9f..446c4cf 100644
}
Bool
-@@ -2947,6 +2959,7 @@ windowResizeNotify (CompWindow *w,
+@@ -3037,6 +3049,7 @@ windowResizeNotify (CompWindow *w,
int dwidth,
int dheight)
{
@@ -1031,7 +997,7 @@ index cffdc9f..446c4cf 100644
}
void
-@@ -2955,6 +2968,7 @@ windowMoveNotify (CompWindow *w,
+@@ -3045,6 +3058,7 @@ windowMoveNotify (CompWindow *w,
int dy,
Bool immediate)
{
diff --git a/compiz/0004-Input-Redirection-Support-in-Plugins.patch b/compiz/0004-Input-Redirection-Support-in-Plugins.patch
index 6a08355..d73b0fe 100644
--- a/compiz/0004-Input-Redirection-Support-in-Plugins.patch
+++ b/compiz/0004-Input-Redirection-Support-in-Plugins.patch
@@ -1,7 +1,7 @@
-From 627839fc6db045a702e980cbd86ab6e7e029374d Mon Sep 17 00:00:00 2001
+From aef166f5170010f4646c97d747e2fe6ec1656896 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
-Date: Wed, 10 Dec 2008 17:40:10 +0900
-Subject: [PATCH] Input Redirection Support in Plugins
+Date: Thu, 19 Mar 2009 13:58:48 +0900
+Subject: [PATCH] Input Redirection Support in Plugins.patch
---
include/compiz-scale.h | 3 +++
@@ -23,7 +23,7 @@ index b09b53e..1611d4b 100644
ScaleSlot *slots;
diff --git a/plugins/scale.c b/plugins/scale.c
-index e9dde08..935c5dd 100644
+index 130359a..b16dea3 100644
--- a/plugins/scale.c
+++ b/plugins/scale.c
@@ -1427,6 +1427,7 @@ scaleInitiateCommon (CompScreen *s,