summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@XPS-SUSE.site>2008-12-16 19:42:41 +0900
committerSam Spilsbury <Sam@XPS-SUSE.site>2008-12-16 19:42:41 +0900
commitc6dd7bf37165ce9445fa44c1da10a30255ffedd5 (patch)
treeafb59f726d96e9029ac3048defbf00aaa96643bf
parentb4302c5418cc3041f6b8ee26eef0c54d08db32bb (diff)
downloadcompiz-mpx-ir-c6dd7bf37165ce9445fa44c1da10a30255ffedd5.tar.gz
compiz-mpx-ir-c6dd7bf37165ce9445fa44c1da10a30255ffedd5.tar.bz2
* Actually update patches
-rw-r--r--fusion/plugins/freewins/0001-MPX-Support.patch12
-rw-r--r--fusion/plugins/freewins/0002-Input-Redirection-Support.patch20
2 files changed, 16 insertions, 16 deletions
diff --git a/fusion/plugins/freewins/0001-MPX-Support.patch b/fusion/plugins/freewins/0001-MPX-Support.patch
index 614d80b..b997e56 100644
--- a/fusion/plugins/freewins/0001-MPX-Support.patch
+++ b/fusion/plugins/freewins/0001-MPX-Support.patch
@@ -1,4 +1,4 @@
-From 4964feddabecf1b6ae033673ac017da2bf542824 Mon Sep 17 00:00:00 2001
+From cd9375d376b3be46eed7434b1fa9aeb2a916e688 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
Date: Wed, 10 Dec 2008 11:09:54 +0900
Subject: [PATCH] MPX Support
@@ -1111,10 +1111,10 @@ index ac8c77b..831c93e 100644
(*d->handleEvent)(d, ev);
WRAP(fwd, d, handleEvent, FWHandleEvent);
diff --git a/freewins.c b/freewins.c
-index 26d83d9..aeb2a21 100644
+index a58a382..30e7292 100644
--- a/freewins.c
+++ b/freewins.c
-@@ -338,6 +338,9 @@ freewinsInitDisplay (CompPlugin *p,
+@@ -325,6 +325,9 @@ freewinsInitDisplay (CompPlugin *p,
fwd->lastGrabWindow = 0;
fwd->axisHelp = FALSE;
fwd->hoverWindow = 0;
@@ -1125,7 +1125,7 @@ index 26d83d9..aeb2a21 100644
if ((fwd->screenPrivateIndex = allocateScreenPrivateIndex (d)) < 0 )
{
diff --git a/freewins.h b/freewins.h
-index a534d0f..4f88496 100644
+index 7482e38..185d6c1 100644
--- a/freewins.h
+++ b/freewins.h
@@ -187,6 +187,19 @@ typedef struct _FWTrackball
@@ -1148,7 +1148,7 @@ index a534d0f..4f88496 100644
/* Transformation info */
typedef struct _FWTransformedWindowInfo
{
-@@ -261,6 +274,9 @@ typedef struct _FWDisplay
+@@ -248,6 +261,9 @@ typedef struct _FWDisplay
CompWindow *hoverWindow;
CompWindow *lastGrabWindow;
@@ -1158,7 +1158,7 @@ index a534d0f..4f88496 100644
Bool axisHelp;
Bool snap;
Bool invert;
-@@ -537,6 +553,17 @@ void FWAdjustIPW (CompWindow *w);
+@@ -518,6 +534,17 @@ void FWAdjustIPW (CompWindow *w);
void FWAdjustIPWStacking (CompScreen *s);
diff --git a/fusion/plugins/freewins/0002-Input-Redirection-Support.patch b/fusion/plugins/freewins/0002-Input-Redirection-Support.patch
index ee88d43..6713527 100644
--- a/fusion/plugins/freewins/0002-Input-Redirection-Support.patch
+++ b/fusion/plugins/freewins/0002-Input-Redirection-Support.patch
@@ -1,4 +1,4 @@
-From 3b97142ec1d8e1b88d49771ee5371f7649116482 Mon Sep 17 00:00:00 2001
+From 15dcc65b50cf608fb132f4a8d6294656fc622348 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <Sam@XPS-SUSE.site>
Date: Wed, 10 Dec 2008 19:45:06 +0900
Subject: [PATCH] Input Redirection Support
@@ -56,10 +56,10 @@ index 831c93e..6f2f0e5 100644
+ WRAP (fws, w->screen, transformMesh, FWTransformMesh);
+}
diff --git a/freewins.c b/freewins.c
-index aeb2a21..332f7ba 100644
+index 30e7292..4737f13 100644
--- a/freewins.c
+++ b/freewins.c
-@@ -295,6 +295,7 @@ freewinsInitScreen (CompPlugin *p,
+@@ -283,6 +283,7 @@ freewinsInitScreen (CompPlugin *p,
WRAP (fws, s, windowResizeNotify, FWWindowResizeNotify);
WRAP (fws, s, windowMoveNotify, FWWindowMoveNotify);
@@ -67,7 +67,7 @@ index aeb2a21..332f7ba 100644
return TRUE;
}
-@@ -319,6 +320,8 @@ freewinsFiniScreen (CompPlugin *p,
+@@ -306,6 +307,8 @@ freewinsFiniScreen (CompPlugin *p,
UNWRAP (fws, s, windowResizeNotify);
UNWRAP (fws, s, windowMoveNotify);
@@ -77,10 +77,10 @@ index aeb2a21..332f7ba 100644
}
diff --git a/freewins.h b/freewins.h
-index 4f88496..247b79f 100644
+index 185d6c1..fd571d2 100644
--- a/freewins.h
+++ b/freewins.h
-@@ -301,6 +301,8 @@ typedef struct _FWScreen
+@@ -287,6 +287,8 @@ typedef struct _FWScreen
WindowResizeNotifyProc windowResizeNotify;
WindowMoveNotifyProc windowMoveNotify;
@@ -89,7 +89,7 @@ index 4f88496..247b79f 100644
FWWindowInputInfo *transformedWindows;
Cursor rotateCursor;
-@@ -537,9 +539,15 @@ Bool toggleFWAxis (CompDisplay *d,
+@@ -518,9 +520,15 @@ Bool toggleFWAxis (CompDisplay *d,
/* event.c */
@@ -163,10 +163,10 @@ index 5a11efa..a3205b4 100644
}
diff --git a/paint.c b/paint.c
-index 3142cb3..321626a 100644
+index c0c9594..3ce950f 100644
--- a/paint.c
+++ b/paint.c
-@@ -403,14 +403,16 @@ FWPaintWindow (CompWindow *w,
+@@ -368,14 +368,16 @@ FWPaintWindow (CompWindow *w,
(fww->transform.scaleY >= fww->animate.destScaleY - 0.00005 &&
fww->transform.scaleY <= fww->animate.destScaleY + 0.00005 ))))
{
@@ -186,7 +186,7 @@ index 3142cb3..321626a 100644
return status;
diff --git a/util.c b/util.c
-index 0ef58eb..7b860e4 100644
+index d86055f..42ca099 100644
--- a/util.c
+++ b/util.c
@@ -499,7 +499,7 @@ Bool