From 7a41b24cb3efcf9bb32189028ddbfedd591e8706 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sun, 7 May 2017 11:05:21 +0200
Subject: [PATCH] first working Crow interface double buffered on drm

---
 Crow.csproj                                   |  61 +-
 Crow.sln                                      |   2 -
 src/Interface.cs                              |  47 +-
 {testDrm => src}/Mono.Cairo/Antialias.cs      |   0
 {testDrm => src}/Mono.Cairo/Cairo.cs          |   0
 {testDrm => src}/Mono.Cairo/CairoDebug.cs     |   0
 {testDrm => src}/Mono.Cairo/Color.cs          |   0
 {testDrm => src}/Mono.Cairo/Content.cs        |   0
 {testDrm => src}/Mono.Cairo/Context.cs        |   0
 {testDrm => src}/Mono.Cairo/Device.cs         |   0
 .../Mono.Cairo/DirectFBSurface.cs             |   0
 {testDrm => src}/Mono.Cairo/Distance.cs       |   0
 {testDrm => src}/Mono.Cairo/EGLDevice.cs      |   0
 {testDrm => src}/Mono.Cairo/Extend.cs         |   0
 {testDrm => src}/Mono.Cairo/FillRule.cs       |   0
 {testDrm => src}/Mono.Cairo/Filter.cs         |   0
 {testDrm => src}/Mono.Cairo/FontExtents.cs    |   0
 {testDrm => src}/Mono.Cairo/FontFace.cs       |   0
 {testDrm => src}/Mono.Cairo/FontOptions.cs    |   0
 {testDrm => src}/Mono.Cairo/FontSlant.cs      |   0
 {testDrm => src}/Mono.Cairo/FontType.cs       |   0
 {testDrm => src}/Mono.Cairo/FontWeight.cs     |   0
 {testDrm => src}/Mono.Cairo/Format.cs         |   0
 {testDrm => src}/Mono.Cairo/GLSurface.cs      |   0
 {testDrm => src}/Mono.Cairo/GLXDevice.cs      |   0
 {testDrm => src}/Mono.Cairo/GlitzSurface.cs   |   0
 {testDrm => src}/Mono.Cairo/Glyph.cs          |   0
 {testDrm => src}/Mono.Cairo/Gradient.cs       |   0
 {testDrm => src}/Mono.Cairo/HintMetrics.cs    |   0
 {testDrm => src}/Mono.Cairo/HintStyle.cs      |   0
 {testDrm => src}/Mono.Cairo/ImageSurface.cs   |   0
 {testDrm => src}/Mono.Cairo/LineCap.cs        |   0
 {testDrm => src}/Mono.Cairo/LineJoin.cs       |   0
 {testDrm => src}/Mono.Cairo/LinearGradient.cs |   0
 {testDrm => src}/Mono.Cairo/Matrix.cs         |   0
 {testDrm => src}/Mono.Cairo/NativeMethods.cs  |   0
 {testDrm => src}/Mono.Cairo/Operator.cs       |   0
 {testDrm => src}/Mono.Cairo/PSSurface.cs      |   0
 {testDrm => src}/Mono.Cairo/Path.cs           |   0
 {testDrm => src}/Mono.Cairo/Pattern.cs        |   0
 {testDrm => src}/Mono.Cairo/PatternType.cs    |   0
 {testDrm => src}/Mono.Cairo/PdfSurface.cs     |   0
 {testDrm => src}/Mono.Cairo/Point.cs          |   0
 {testDrm => src}/Mono.Cairo/PointD.cs         |   0
 {testDrm => src}/Mono.Cairo/RadialGradient.cs |   0
 {testDrm => src}/Mono.Cairo/Rectangle.cs      |   0
 {testDrm => src}/Mono.Cairo/Region.cs         |   0
 {testDrm => src}/Mono.Cairo/ScaledFont.cs     |   0
 {testDrm => src}/Mono.Cairo/SolidPattern.cs   |   0
 {testDrm => src}/Mono.Cairo/Status.cs         |   0
 {testDrm => src}/Mono.Cairo/SubpixelOrder.cs  |   0
 {testDrm => src}/Mono.Cairo/Surface.cs        |   0
 {testDrm => src}/Mono.Cairo/SurfacePattern.cs |   0
 {testDrm => src}/Mono.Cairo/SurfaceType.cs    |   0
 {testDrm => src}/Mono.Cairo/SvgSurface.cs     |   0
 {testDrm => src}/Mono.Cairo/SvgVersion.cs     |   0
 {testDrm => src}/Mono.Cairo/TextExtents.cs    |   0
 {testDrm => src}/Mono.Cairo/WGLDevice.cs      |   0
 {testDrm => src}/Mono.Cairo/Win32Surface.cs   |   0
 {testDrm => src}/Mono.Cairo/XcbSurface.cs     |   0
 {testDrm => src}/Mono.Cairo/XlibSurface.cs    |   0
 testDrm/Main.cs                               | 332 +----------
 testDrm/src/{DrmDevice.cs => Application.cs}  | 536 ++++++++----------
 testDrm/src/Linux/Bindings/Drm.cs             |  10 +-
 testDrm/src/Linux/Bindings/Gbm.cs             |   9 +-
 testDrm/testDrm.csproj                        |  62 +-
 66 files changed, 330 insertions(+), 729 deletions(-)
 rename {testDrm => src}/Mono.Cairo/Antialias.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Cairo.cs (100%)
 rename {testDrm => src}/Mono.Cairo/CairoDebug.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Color.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Content.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Context.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Device.cs (100%)
 rename {testDrm => src}/Mono.Cairo/DirectFBSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Distance.cs (100%)
 rename {testDrm => src}/Mono.Cairo/EGLDevice.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Extend.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FillRule.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Filter.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontExtents.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontFace.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontOptions.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontSlant.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontType.cs (100%)
 rename {testDrm => src}/Mono.Cairo/FontWeight.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Format.cs (100%)
 rename {testDrm => src}/Mono.Cairo/GLSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/GLXDevice.cs (100%)
 rename {testDrm => src}/Mono.Cairo/GlitzSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Glyph.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Gradient.cs (100%)
 rename {testDrm => src}/Mono.Cairo/HintMetrics.cs (100%)
 rename {testDrm => src}/Mono.Cairo/HintStyle.cs (100%)
 rename {testDrm => src}/Mono.Cairo/ImageSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/LineCap.cs (100%)
 rename {testDrm => src}/Mono.Cairo/LineJoin.cs (100%)
 rename {testDrm => src}/Mono.Cairo/LinearGradient.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Matrix.cs (100%)
 rename {testDrm => src}/Mono.Cairo/NativeMethods.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Operator.cs (100%)
 rename {testDrm => src}/Mono.Cairo/PSSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Path.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Pattern.cs (100%)
 rename {testDrm => src}/Mono.Cairo/PatternType.cs (100%)
 rename {testDrm => src}/Mono.Cairo/PdfSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Point.cs (100%)
 rename {testDrm => src}/Mono.Cairo/PointD.cs (100%)
 rename {testDrm => src}/Mono.Cairo/RadialGradient.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Rectangle.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Region.cs (100%)
 rename {testDrm => src}/Mono.Cairo/ScaledFont.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SolidPattern.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Status.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SubpixelOrder.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Surface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SurfacePattern.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SurfaceType.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SvgSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/SvgVersion.cs (100%)
 rename {testDrm => src}/Mono.Cairo/TextExtents.cs (100%)
 rename {testDrm => src}/Mono.Cairo/WGLDevice.cs (100%)
 rename {testDrm => src}/Mono.Cairo/Win32Surface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/XcbSurface.cs (100%)
 rename {testDrm => src}/Mono.Cairo/XlibSurface.cs (100%)
 rename testDrm/src/{DrmDevice.cs => Application.cs} (67%)

diff --git a/Crow.csproj b/Crow.csproj
index 20b38cf8..a434dc87 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -154,6 +154,64 @@
     <Compile Include="src\PerformanceMeasure.cs" />
     <Compile Include="src\IML\BindingMember.cs" />
     <Compile Include="src\CrowThread.cs" />
+    <Compile Include="src\Mono.Cairo\Antialias.cs" />
+    <Compile Include="src\Mono.Cairo\Cairo.cs" />
+    <Compile Include="src\Mono.Cairo\CairoDebug.cs" />
+    <Compile Include="src\Mono.Cairo\Color.cs" />
+    <Compile Include="src\Mono.Cairo\Content.cs" />
+    <Compile Include="src\Mono.Cairo\Context.cs" />
+    <Compile Include="src\Mono.Cairo\Device.cs" />
+    <Compile Include="src\Mono.Cairo\DirectFBSurface.cs" />
+    <Compile Include="src\Mono.Cairo\Distance.cs" />
+    <Compile Include="src\Mono.Cairo\EGLDevice.cs" />
+    <Compile Include="src\Mono.Cairo\Extend.cs" />
+    <Compile Include="src\Mono.Cairo\FillRule.cs" />
+    <Compile Include="src\Mono.Cairo\Filter.cs" />
+    <Compile Include="src\Mono.Cairo\FontExtents.cs" />
+    <Compile Include="src\Mono.Cairo\FontFace.cs" />
+    <Compile Include="src\Mono.Cairo\FontOptions.cs" />
+    <Compile Include="src\Mono.Cairo\FontSlant.cs" />
+    <Compile Include="src\Mono.Cairo\FontType.cs" />
+    <Compile Include="src\Mono.Cairo\FontWeight.cs" />
+    <Compile Include="src\Mono.Cairo\Format.cs" />
+    <Compile Include="src\Mono.Cairo\GlitzSurface.cs" />
+    <Compile Include="src\Mono.Cairo\GLSurface.cs" />
+    <Compile Include="src\Mono.Cairo\GLXDevice.cs" />
+    <Compile Include="src\Mono.Cairo\Glyph.cs" />
+    <Compile Include="src\Mono.Cairo\Gradient.cs" />
+    <Compile Include="src\Mono.Cairo\HintMetrics.cs" />
+    <Compile Include="src\Mono.Cairo\HintStyle.cs" />
+    <Compile Include="src\Mono.Cairo\ImageSurface.cs" />
+    <Compile Include="src\Mono.Cairo\LinearGradient.cs" />
+    <Compile Include="src\Mono.Cairo\LineCap.cs" />
+    <Compile Include="src\Mono.Cairo\LineJoin.cs" />
+    <Compile Include="src\Mono.Cairo\Matrix.cs" />
+    <Compile Include="src\Mono.Cairo\NativeMethods.cs" />
+    <Compile Include="src\Mono.Cairo\Operator.cs" />
+    <Compile Include="src\Mono.Cairo\Path.cs" />
+    <Compile Include="src\Mono.Cairo\Pattern.cs" />
+    <Compile Include="src\Mono.Cairo\PatternType.cs" />
+    <Compile Include="src\Mono.Cairo\PdfSurface.cs" />
+    <Compile Include="src\Mono.Cairo\Point.cs" />
+    <Compile Include="src\Mono.Cairo\PointD.cs" />
+    <Compile Include="src\Mono.Cairo\PSSurface.cs" />
+    <Compile Include="src\Mono.Cairo\RadialGradient.cs" />
+    <Compile Include="src\Mono.Cairo\Rectangle.cs" />
+    <Compile Include="src\Mono.Cairo\Region.cs" />
+    <Compile Include="src\Mono.Cairo\ScaledFont.cs" />
+    <Compile Include="src\Mono.Cairo\SolidPattern.cs" />
+    <Compile Include="src\Mono.Cairo\Status.cs" />
+    <Compile Include="src\Mono.Cairo\SubpixelOrder.cs" />
+    <Compile Include="src\Mono.Cairo\Surface.cs" />
+    <Compile Include="src\Mono.Cairo\SurfacePattern.cs" />
+    <Compile Include="src\Mono.Cairo\SurfaceType.cs" />
+    <Compile Include="src\Mono.Cairo\SvgSurface.cs" />
+    <Compile Include="src\Mono.Cairo\SvgVersion.cs" />
+    <Compile Include="src\Mono.Cairo\TextExtents.cs" />
+    <Compile Include="src\Mono.Cairo\WGLDevice.cs" />
+    <Compile Include="src\Mono.Cairo\Win32Surface.cs" />
+    <Compile Include="src\Mono.Cairo\XcbSurface.cs" />
+    <Compile Include="src\Mono.Cairo\XlibSurface.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -161,9 +219,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
-    <Reference Include="cairo-sharp">
-      <Package>gtk-sharp-3.0</Package>
-    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Crow.sln b/Crow.sln
index 9edb890b..97e14933 100644
--- a/Crow.sln
+++ b/Crow.sln
@@ -22,13 +22,11 @@ Global
 		{4B57740A-75FB-4978-A8E8-8B1793B7474F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B57740A-75FB-4978-A8E8-8B1793B7474F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A37A7E14-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A37A7E14-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6D911CD-1D09-42FC-B300-9187190F2AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6D911CD-1D09-42FC-B300-9187190F2AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B6D911CD-1D09-42FC-B300-9187190F2AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6D911CD-1D09-42FC-B300-9187190F2AE1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/src/Interface.cs b/src/Interface.cs
index 8439c31e..6c7d99c4 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -511,28 +511,30 @@ namespace Crow
 						clipping.stroke (ctx, Color.Red.AdjustAlpha(0.5));
 						#endif
 						lock (RenderMutex) {
-							if (IsDirty)
-								DirtyRect += clipping.Bounds;
-							else
-								DirtyRect = clipping.Bounds;
-
-							DirtyRect.Left = Math.Max (0, DirtyRect.Left);
-							DirtyRect.Top = Math.Max (0, DirtyRect.Top);
-							DirtyRect.Width = Math.Min (ClientRectangle.Width - DirtyRect.Left, DirtyRect.Width);
-							DirtyRect.Height = Math.Min (ClientRectangle.Height - DirtyRect.Top, DirtyRect.Height);
-							DirtyRect.Width = Math.Max (0, DirtyRect.Width);
-							DirtyRect.Height = Math.Max (0, DirtyRect.Height);
-
-							if (DirtyRect.Width > 0 && DirtyRect.Height >0) {
-								dirtyBmp = new byte[4 * DirtyRect.Width * DirtyRect.Height];
-								for (int y = 0; y < DirtyRect.Height; y++) {
-									Array.Copy (bmp,
-										((DirtyRect.Top + y) * ClientRectangle.Width * 4) + DirtyRect.Left * 4,
-										dirtyBmp, y * DirtyRect.Width * 4, DirtyRect.Width * 4);
-								}
-								IsDirty = true;
-							} else
-								IsDirty = false;
+							Array.Copy (bmp, dirtyBmp, bmp.Length);
+							IsDirty = true;
+//							if (IsDirty)
+//								DirtyRect += clipping.Bounds;
+//							else
+//								DirtyRect = clipping.Bounds;
+//
+//							DirtyRect.Left = Math.Max (0, DirtyRect.Left);
+//							DirtyRect.Top = Math.Max (0, DirtyRect.Top);
+//							DirtyRect.Width = Math.Min (ClientRectangle.Width - DirtyRect.Left, DirtyRect.Width);
+//							DirtyRect.Height = Math.Min (ClientRectangle.Height - DirtyRect.Top, DirtyRect.Height);
+//							DirtyRect.Width = Math.Max (0, DirtyRect.Width);
+//							DirtyRect.Height = Math.Max (0, DirtyRect.Height);
+//
+//							if (DirtyRect.Width > 0 && DirtyRect.Height >0) {
+//								dirtyBmp = new byte[4 * DirtyRect.Width * DirtyRect.Height];
+//								for (int y = 0; y < DirtyRect.Height; y++) {
+//									Array.Copy (bmp,
+//										((DirtyRect.Top + y) * ClientRectangle.Width * 4) + DirtyRect.Left * 4,
+//										dirtyBmp, y * DirtyRect.Width * 4, DirtyRect.Width * 4);
+//								}
+//
+//							} else
+//								IsDirty = false;
 						}
 						clipping.Reset ();
 					}
@@ -646,6 +648,7 @@ namespace Crow
 				int stride = 4 * ClientRectangle.Width;
 				int bmpSize = Math.Abs (stride) * ClientRectangle.Height;
 				bmp = new byte[bmpSize];
+				dirtyBmp = new byte[bmpSize];
 
 				foreach (GraphicObject g in GraphicTree)
 					g.RegisterForLayouting (LayoutingType.All);
diff --git a/testDrm/Mono.Cairo/Antialias.cs b/src/Mono.Cairo/Antialias.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Antialias.cs
rename to src/Mono.Cairo/Antialias.cs
diff --git a/testDrm/Mono.Cairo/Cairo.cs b/src/Mono.Cairo/Cairo.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Cairo.cs
rename to src/Mono.Cairo/Cairo.cs
diff --git a/testDrm/Mono.Cairo/CairoDebug.cs b/src/Mono.Cairo/CairoDebug.cs
similarity index 100%
rename from testDrm/Mono.Cairo/CairoDebug.cs
rename to src/Mono.Cairo/CairoDebug.cs
diff --git a/testDrm/Mono.Cairo/Color.cs b/src/Mono.Cairo/Color.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Color.cs
rename to src/Mono.Cairo/Color.cs
diff --git a/testDrm/Mono.Cairo/Content.cs b/src/Mono.Cairo/Content.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Content.cs
rename to src/Mono.Cairo/Content.cs
diff --git a/testDrm/Mono.Cairo/Context.cs b/src/Mono.Cairo/Context.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Context.cs
rename to src/Mono.Cairo/Context.cs
diff --git a/testDrm/Mono.Cairo/Device.cs b/src/Mono.Cairo/Device.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Device.cs
rename to src/Mono.Cairo/Device.cs
diff --git a/testDrm/Mono.Cairo/DirectFBSurface.cs b/src/Mono.Cairo/DirectFBSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/DirectFBSurface.cs
rename to src/Mono.Cairo/DirectFBSurface.cs
diff --git a/testDrm/Mono.Cairo/Distance.cs b/src/Mono.Cairo/Distance.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Distance.cs
rename to src/Mono.Cairo/Distance.cs
diff --git a/testDrm/Mono.Cairo/EGLDevice.cs b/src/Mono.Cairo/EGLDevice.cs
similarity index 100%
rename from testDrm/Mono.Cairo/EGLDevice.cs
rename to src/Mono.Cairo/EGLDevice.cs
diff --git a/testDrm/Mono.Cairo/Extend.cs b/src/Mono.Cairo/Extend.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Extend.cs
rename to src/Mono.Cairo/Extend.cs
diff --git a/testDrm/Mono.Cairo/FillRule.cs b/src/Mono.Cairo/FillRule.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FillRule.cs
rename to src/Mono.Cairo/FillRule.cs
diff --git a/testDrm/Mono.Cairo/Filter.cs b/src/Mono.Cairo/Filter.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Filter.cs
rename to src/Mono.Cairo/Filter.cs
diff --git a/testDrm/Mono.Cairo/FontExtents.cs b/src/Mono.Cairo/FontExtents.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontExtents.cs
rename to src/Mono.Cairo/FontExtents.cs
diff --git a/testDrm/Mono.Cairo/FontFace.cs b/src/Mono.Cairo/FontFace.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontFace.cs
rename to src/Mono.Cairo/FontFace.cs
diff --git a/testDrm/Mono.Cairo/FontOptions.cs b/src/Mono.Cairo/FontOptions.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontOptions.cs
rename to src/Mono.Cairo/FontOptions.cs
diff --git a/testDrm/Mono.Cairo/FontSlant.cs b/src/Mono.Cairo/FontSlant.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontSlant.cs
rename to src/Mono.Cairo/FontSlant.cs
diff --git a/testDrm/Mono.Cairo/FontType.cs b/src/Mono.Cairo/FontType.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontType.cs
rename to src/Mono.Cairo/FontType.cs
diff --git a/testDrm/Mono.Cairo/FontWeight.cs b/src/Mono.Cairo/FontWeight.cs
similarity index 100%
rename from testDrm/Mono.Cairo/FontWeight.cs
rename to src/Mono.Cairo/FontWeight.cs
diff --git a/testDrm/Mono.Cairo/Format.cs b/src/Mono.Cairo/Format.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Format.cs
rename to src/Mono.Cairo/Format.cs
diff --git a/testDrm/Mono.Cairo/GLSurface.cs b/src/Mono.Cairo/GLSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/GLSurface.cs
rename to src/Mono.Cairo/GLSurface.cs
diff --git a/testDrm/Mono.Cairo/GLXDevice.cs b/src/Mono.Cairo/GLXDevice.cs
similarity index 100%
rename from testDrm/Mono.Cairo/GLXDevice.cs
rename to src/Mono.Cairo/GLXDevice.cs
diff --git a/testDrm/Mono.Cairo/GlitzSurface.cs b/src/Mono.Cairo/GlitzSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/GlitzSurface.cs
rename to src/Mono.Cairo/GlitzSurface.cs
diff --git a/testDrm/Mono.Cairo/Glyph.cs b/src/Mono.Cairo/Glyph.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Glyph.cs
rename to src/Mono.Cairo/Glyph.cs
diff --git a/testDrm/Mono.Cairo/Gradient.cs b/src/Mono.Cairo/Gradient.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Gradient.cs
rename to src/Mono.Cairo/Gradient.cs
diff --git a/testDrm/Mono.Cairo/HintMetrics.cs b/src/Mono.Cairo/HintMetrics.cs
similarity index 100%
rename from testDrm/Mono.Cairo/HintMetrics.cs
rename to src/Mono.Cairo/HintMetrics.cs
diff --git a/testDrm/Mono.Cairo/HintStyle.cs b/src/Mono.Cairo/HintStyle.cs
similarity index 100%
rename from testDrm/Mono.Cairo/HintStyle.cs
rename to src/Mono.Cairo/HintStyle.cs
diff --git a/testDrm/Mono.Cairo/ImageSurface.cs b/src/Mono.Cairo/ImageSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/ImageSurface.cs
rename to src/Mono.Cairo/ImageSurface.cs
diff --git a/testDrm/Mono.Cairo/LineCap.cs b/src/Mono.Cairo/LineCap.cs
similarity index 100%
rename from testDrm/Mono.Cairo/LineCap.cs
rename to src/Mono.Cairo/LineCap.cs
diff --git a/testDrm/Mono.Cairo/LineJoin.cs b/src/Mono.Cairo/LineJoin.cs
similarity index 100%
rename from testDrm/Mono.Cairo/LineJoin.cs
rename to src/Mono.Cairo/LineJoin.cs
diff --git a/testDrm/Mono.Cairo/LinearGradient.cs b/src/Mono.Cairo/LinearGradient.cs
similarity index 100%
rename from testDrm/Mono.Cairo/LinearGradient.cs
rename to src/Mono.Cairo/LinearGradient.cs
diff --git a/testDrm/Mono.Cairo/Matrix.cs b/src/Mono.Cairo/Matrix.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Matrix.cs
rename to src/Mono.Cairo/Matrix.cs
diff --git a/testDrm/Mono.Cairo/NativeMethods.cs b/src/Mono.Cairo/NativeMethods.cs
similarity index 100%
rename from testDrm/Mono.Cairo/NativeMethods.cs
rename to src/Mono.Cairo/NativeMethods.cs
diff --git a/testDrm/Mono.Cairo/Operator.cs b/src/Mono.Cairo/Operator.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Operator.cs
rename to src/Mono.Cairo/Operator.cs
diff --git a/testDrm/Mono.Cairo/PSSurface.cs b/src/Mono.Cairo/PSSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/PSSurface.cs
rename to src/Mono.Cairo/PSSurface.cs
diff --git a/testDrm/Mono.Cairo/Path.cs b/src/Mono.Cairo/Path.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Path.cs
rename to src/Mono.Cairo/Path.cs
diff --git a/testDrm/Mono.Cairo/Pattern.cs b/src/Mono.Cairo/Pattern.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Pattern.cs
rename to src/Mono.Cairo/Pattern.cs
diff --git a/testDrm/Mono.Cairo/PatternType.cs b/src/Mono.Cairo/PatternType.cs
similarity index 100%
rename from testDrm/Mono.Cairo/PatternType.cs
rename to src/Mono.Cairo/PatternType.cs
diff --git a/testDrm/Mono.Cairo/PdfSurface.cs b/src/Mono.Cairo/PdfSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/PdfSurface.cs
rename to src/Mono.Cairo/PdfSurface.cs
diff --git a/testDrm/Mono.Cairo/Point.cs b/src/Mono.Cairo/Point.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Point.cs
rename to src/Mono.Cairo/Point.cs
diff --git a/testDrm/Mono.Cairo/PointD.cs b/src/Mono.Cairo/PointD.cs
similarity index 100%
rename from testDrm/Mono.Cairo/PointD.cs
rename to src/Mono.Cairo/PointD.cs
diff --git a/testDrm/Mono.Cairo/RadialGradient.cs b/src/Mono.Cairo/RadialGradient.cs
similarity index 100%
rename from testDrm/Mono.Cairo/RadialGradient.cs
rename to src/Mono.Cairo/RadialGradient.cs
diff --git a/testDrm/Mono.Cairo/Rectangle.cs b/src/Mono.Cairo/Rectangle.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Rectangle.cs
rename to src/Mono.Cairo/Rectangle.cs
diff --git a/testDrm/Mono.Cairo/Region.cs b/src/Mono.Cairo/Region.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Region.cs
rename to src/Mono.Cairo/Region.cs
diff --git a/testDrm/Mono.Cairo/ScaledFont.cs b/src/Mono.Cairo/ScaledFont.cs
similarity index 100%
rename from testDrm/Mono.Cairo/ScaledFont.cs
rename to src/Mono.Cairo/ScaledFont.cs
diff --git a/testDrm/Mono.Cairo/SolidPattern.cs b/src/Mono.Cairo/SolidPattern.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SolidPattern.cs
rename to src/Mono.Cairo/SolidPattern.cs
diff --git a/testDrm/Mono.Cairo/Status.cs b/src/Mono.Cairo/Status.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Status.cs
rename to src/Mono.Cairo/Status.cs
diff --git a/testDrm/Mono.Cairo/SubpixelOrder.cs b/src/Mono.Cairo/SubpixelOrder.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SubpixelOrder.cs
rename to src/Mono.Cairo/SubpixelOrder.cs
diff --git a/testDrm/Mono.Cairo/Surface.cs b/src/Mono.Cairo/Surface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Surface.cs
rename to src/Mono.Cairo/Surface.cs
diff --git a/testDrm/Mono.Cairo/SurfacePattern.cs b/src/Mono.Cairo/SurfacePattern.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SurfacePattern.cs
rename to src/Mono.Cairo/SurfacePattern.cs
diff --git a/testDrm/Mono.Cairo/SurfaceType.cs b/src/Mono.Cairo/SurfaceType.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SurfaceType.cs
rename to src/Mono.Cairo/SurfaceType.cs
diff --git a/testDrm/Mono.Cairo/SvgSurface.cs b/src/Mono.Cairo/SvgSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SvgSurface.cs
rename to src/Mono.Cairo/SvgSurface.cs
diff --git a/testDrm/Mono.Cairo/SvgVersion.cs b/src/Mono.Cairo/SvgVersion.cs
similarity index 100%
rename from testDrm/Mono.Cairo/SvgVersion.cs
rename to src/Mono.Cairo/SvgVersion.cs
diff --git a/testDrm/Mono.Cairo/TextExtents.cs b/src/Mono.Cairo/TextExtents.cs
similarity index 100%
rename from testDrm/Mono.Cairo/TextExtents.cs
rename to src/Mono.Cairo/TextExtents.cs
diff --git a/testDrm/Mono.Cairo/WGLDevice.cs b/src/Mono.Cairo/WGLDevice.cs
similarity index 100%
rename from testDrm/Mono.Cairo/WGLDevice.cs
rename to src/Mono.Cairo/WGLDevice.cs
diff --git a/testDrm/Mono.Cairo/Win32Surface.cs b/src/Mono.Cairo/Win32Surface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/Win32Surface.cs
rename to src/Mono.Cairo/Win32Surface.cs
diff --git a/testDrm/Mono.Cairo/XcbSurface.cs b/src/Mono.Cairo/XcbSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/XcbSurface.cs
rename to src/Mono.Cairo/XcbSurface.cs
diff --git a/testDrm/Mono.Cairo/XlibSurface.cs b/src/Mono.Cairo/XlibSurface.cs
similarity index 100%
rename from testDrm/Mono.Cairo/XlibSurface.cs
rename to src/Mono.Cairo/XlibSurface.cs
diff --git a/testDrm/Main.cs b/testDrm/Main.cs
index 77e0d405..d283e8b1 100644
--- a/testDrm/Main.cs
+++ b/testDrm/Main.cs
@@ -26,338 +26,28 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using OpenTK.Platform.Linux;
 using System.Collections.Generic;
-using OpenTK;
-using OpenTK.Platform.Egl;
 using Cairo;
+using Crow.Linux;
 
 namespace testDrm
 {
-	// Stores platform-specific information about a display
-	class LinuxDisplay
-	{
-		public int FD;
-		public IntPtr Connector;
-		public IntPtr Crtc;
-		public IntPtr Encoder;
-
-		unsafe public ModeConnector* pConnector { get { return (ModeConnector*)Connector; } }
-		unsafe public ModeCrtc* pCrtc { get { return (ModeCrtc*)Crtc; } }
-		unsafe public ModeEncoder* pEncoder { get { return (ModeEncoder*)Encoder; } }
-		/*
-        public ModeInfo Mode
-        {
-            get
-            {
-                if (Crtc == IntPtr.Zero)
-                    throw new InvalidOperationException();
-
-                unsafe
-                {
-                    return pCrtc->mode;
-                }
-            }
-        }
-        */
-
-		public ModeInfo OriginalMode;
-
-		public int Id
-		{
-			get
-			{
-				if (Crtc == IntPtr.Zero)
-					throw new InvalidOperationException();
-
-				unsafe
-				{
-					return (int)pCrtc->crtc_id;
-				}
-			}
-		}
-
-		public LinuxDisplay(int fd, IntPtr c, IntPtr e, IntPtr r)
-		{
-			FD = fd;
-			Connector = c;
-			Encoder = e;
-			Crtc = r;
-			unsafe
-			{
-				OriginalMode = pCrtc->mode; // in case we change resolution later on
-			}
-		}
-	}
+	
 	static class TestDrm
-	{
-		const string gpu_path = "/dev/dri"; // card0, card1, ...
-
-		[STAThread]
+	{		
 		static void Main ()
 		{
-			
 
-//			using (Surface s = new ImageSurface (Format.Argb32,800,600)) {
-//				
-//			}
-//			IntPtr gbm_device;
-//			IntPtr egl_display;
-//
-//			int gpu_fd = CreateDisplay(out gbm_device, out egl_display);
-			using (DrmDevice drm = new DrmDevice ()) {
-				drm.RenderingLoop ();
+			using (Application drm = new Application ()) {
+				//drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/Divers/colorPicker.crow");
+				drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/Divers/0.crow");
+				drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/Divers/0.crow");
+				drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/Divers/0.crow");
+				drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/Divers/0.crow");
+				//drm.CrowInterface.LoadInterface (@"/mnt/data2/devel/crow/Tests/Interfaces/GraphicObject/2.crow");
+				drm.Run ();
 			}
 		}
-
-		static int CreateDisplay(out IntPtr gbm_device, out IntPtr egl_display)
-		{
-			// Query all GPUs until we find one that has a connected display.
-			// This is necessary in multi-gpu systems, where only one GPU
-			// can output a signal.
-			// Todo: allow OpenTK to drive multiple GPUs
-			// Todo: allow OpenTK to run on an offscreen GPU
-			// Todo: allow the user to pick a GPU
-			int fd = 0;
-			gbm_device = IntPtr.Zero;
-			egl_display = IntPtr.Zero;
-
-			var files = Directory.GetFiles(gpu_path);
-			foreach (var gpu in files)
-			{
-				if (System.IO.Path.GetFileName(gpu).StartsWith("card"))
-				{
-					int test_fd = SetupDisplay(gpu, out gbm_device, out egl_display);
-					if (test_fd >= 0)
-					{
-						try
-						{
-							if (QueryDisplays(test_fd, null))
-							{
-								fd = test_fd;
-								break;
-							}
-						}
-						catch (Exception e)
-						{
-							Debug.WriteLine(e.ToString());
-						}
-
-						Console.WriteLine("[KMS] GPU '{0}' is not connected, skipping.", gpu);
-						Libc.close(test_fd);
-					}
-				}
-			}
-
-			if (fd == 0)
-			{
-				Console.WriteLine("[Error] No valid GPU found, bailing out.");
-				throw new PlatformNotSupportedException();
-			}
-
-			return fd;
-		}
-		static bool QueryDisplays(int fd, List<LinuxDisplay> displays)
-		{
-			unsafe
-			{
-				bool has_displays = false;
-				if (displays != null)
-				{
-					displays.Clear();
-				}
-
-				ModeRes* resources = (ModeRes*)Drm.ModeGetResources(fd);
-				if (resources == null)
-				{
-					Console.WriteLine("[KMS] Drm.ModeGetResources failed.");
-					return false;
-				}
-				Console.WriteLine("[KMS] DRM found {0} connectors", resources->count_connectors);
-
-				// Search for a valid connector
-				ModeConnector* connector = null;
-				for (int i = 0; i < resources->count_connectors; i++)
-				{
-					connector = (ModeConnector*)Drm.ModeGetConnector(fd, *(resources->connectors + i));
-					if (connector != null)
-					{
-						bool success = false;
-						LinuxDisplay display = null;
-						try
-						{
-							if (connector->connection == ModeConnection.Connected && connector->count_modes > 0)
-							{
-								success = QueryDisplay(fd, connector, out display);
-								has_displays |= success;
-							}
-						}
-						catch (Exception e)
-						{
-							Console.WriteLine("[KMS] Failed to add display. Error: {0}", e);
-						}
-
-						if (success && displays != null)
-						{
-							displays.Add(display);
-						}
-						else
-						{
-							Drm.ModeFreeConnector((IntPtr)connector);
-							connector = null;
-						}
-					}
-				}
-
-				return has_displays;
-			}
-		}
-		unsafe static bool QueryDisplay(int fd, ModeConnector* c, out LinuxDisplay display)
-		{
-			display = null;
-
-			// Find corresponding encoder
-			ModeEncoder* encoder = GetEncoder(fd, c);
-			if (encoder == null)
-				return false;
-
-			ModeCrtc* crtc = GetCrtc(fd, encoder);
-			if (crtc == null)
-				return false;
-
-			display = new LinuxDisplay(fd, (IntPtr)c, (IntPtr)encoder, (IntPtr)crtc);
-			return true;
-		}
-		unsafe static ModeEncoder* GetEncoder(int fd, ModeConnector* c)
-		{
-			ModeEncoder* encoder = null;
-			for (int i = 0; i < c->count_encoders && encoder == null; i++)
-			{
-				ModeEncoder* e = (ModeEncoder*)Drm.ModeGetEncoder(fd, *(c->encoders + i));
-
-				if (e == null)
-					continue;
-				
-				if (e->encoder_id == c->encoder_id)
-					encoder = e;					
-				else
-					Drm.ModeFreeEncoder((IntPtr)e);					
-			}
-
-			if (encoder != null)
-				Console.WriteLine("[KMS] Encoder {0} found for connector {1}", encoder->encoder_id, c->connector_id);
-			else
-				Console.WriteLine("[KMS] Failed to find encoder for connector {0}", c->connector_id);
-
-			return encoder;
-		}
-
-		unsafe static ModeCrtc* GetCrtc(int fd, ModeEncoder* encoder)
-		{
-			ModeCrtc* crtc = (ModeCrtc*)Drm.ModeGetCrtc(fd, encoder->crtc_id);
-			if (crtc != null)
-			{
-				Console.WriteLine("[KMS] CRTC {0} found for encoder {1}",
-					encoder->crtc_id, encoder->encoder_id);
-			}
-			else
-			{
-				Console.WriteLine("[KMS] Failed to find crtc {0} for encoder {1}",
-					encoder->crtc_id, encoder->encoder_id);
-			}
-			return crtc;
-		}
-
-		unsafe static void GetModes(LinuxDisplay display, DisplayResolution[] modes, out DisplayResolution current)
-		{
-			int mode_count = display.pConnector->count_modes;
-			Console.WriteLine("[KMS] Display supports {0} mode(s)", mode_count);
-			for (int i = 0; i < mode_count; i++)
-			{
-				ModeInfo* mode = display.pConnector->modes + i;
-				if (mode != null)
-				{
-					Console.WriteLine("Mode {0}: {1}x{2} @{3}", i,
-						mode->hdisplay, mode->vdisplay, mode->vrefresh);
-					DisplayResolution res = GetDisplayResolution(mode);
-					modes[i] = res;
-				}
-			}
-
-			if (display.pCrtc->mode_valid != 0)
-			{
-				ModeInfo cmode = display.pCrtc->mode;
-				current = GetDisplayResolution(&cmode);
-			}
-			else
-			{
-				current = GetDisplayResolution(display.pConnector->modes);
-			}
-			Console.WriteLine("Current mode: {0}", current.ToString());
-		}
-		unsafe static DisplayResolution GetDisplayResolution(ModeInfo* mode)
-		{
-			return new DisplayResolution(
-				0, 0,
-				mode->hdisplay, mode->vdisplay,
-				32, // This is actually part of the framebuffer, not the DisplayResolution
-				mode->vrefresh);
-		}
-
-		unsafe static ModeInfo* GetModeInfo(LinuxDisplay display, DisplayResolution resolution)
-		{
-			for (int i = 0; i < display.pConnector->count_modes; i++)
-			{
-				ModeInfo* mode = display.pConnector->modes + i;
-				if (mode != null &&
-					mode->hdisplay == resolution.Width &&
-					mode->vdisplay == resolution.Height)
-				{
-					return mode;
-				}
-			}
-			return null;
-		}
-
-		static int SetupDisplay(string gpu, out IntPtr gbm_device, out IntPtr egl_display)
-		{
-			Console.WriteLine("[KMS] Attempting to use gpu '{0}'.", gpu);
-
-			gbm_device = IntPtr.Zero;
-			egl_display = IntPtr.Zero;
-
-			int fd = Libc.open(gpu, OpenFlags.ReadWrite | OpenFlags.CloseOnExec);
-			if (fd < 0)
-			{
-				Console.WriteLine("[KMS] Failed to open gpu");
-				return fd;
-			}
-			Console.WriteLine("[KMS] GPU '{0}' opened as fd:{1}", gpu, fd);
-
-			gbm_device = Gbm.CreateDevice(fd);
-			if (gbm_device == IntPtr.Zero)
-			{
-				throw new NotSupportedException("[KMS] Failed to create GBM device");
-			}
-			Console.WriteLine("[KMS] GBM {0:x} created successfully; ", gbm_device);
-
-			egl_display = Egl.GetDisplay(gbm_device);
-			if (egl_display == IntPtr.Zero)
-			{
-				throw new NotSupportedException("[KMS] Failed to create EGL display");
-			}
-			Console.WriteLine("[KMS] EGL display {0:x} created successfully", egl_display);
-
-			int major, minor;
-			if (!Egl.Initialize(egl_display, out major, out minor))
-			{
-				ErrorCode error = Egl.GetError();
-				throw new NotSupportedException("[KMS] Failed to initialize EGL display. Error code: " + error);
-			}
-			Console.WriteLine("[KMS] EGL {0}.{1} initialized successfully on display {2:x}", major, minor, egl_display);
-
-			return fd;
-		}
 	}
 }
 
diff --git a/testDrm/src/DrmDevice.cs b/testDrm/src/Application.cs
similarity index 67%
rename from testDrm/src/DrmDevice.cs
rename to testDrm/src/Application.cs
index 82697ba9..2745b548 100644
--- a/testDrm/src/DrmDevice.cs
+++ b/testDrm/src/Application.cs
@@ -33,14 +33,43 @@ using OpenTK.Platform.Egl;
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace testDrm
+namespace Crow.Linux
 {
-	public class DrmDevice : IDisposable
+	public class Application : IDisposable
 	{
+		#region Crow interface
+		public Interface CrowInterface;
+		public bool mouseIsInInterface = false;
+
+		void interfaceThread()
+		{
+			while (CrowInterface.ClientRectangle.Size.Width == 0)
+				Thread.Sleep (5);
+
+			while (true) {
+				CrowInterface.Update ();
+				Thread.Sleep (1);
+			}
+		}
+		void initCrow (){
+			CrowInterface = new Interface ();
+
+			Thread t = new Thread (interfaceThread);
+			t.IsBackground = true;
+			t.Start ();
+
+			updateCrowInterfaceBounds ();
+		}
+		void updateCrowInterfaceBounds () {
+			CrowInterface.ProcessResize (new Size (originalMode.hdisplay, originalMode.vdisplay));
+		}
+		#endregion
+
 		volatile bool run = true;
 
-		int fd = 0;
+		int fd_gpu = 0;
 		int major, minor;
+
 		IntPtr gbm_device, gbm_surface, egl_display, egl_config, egl_surface, egl_ctx;
 
 		int r, g, b, a;
@@ -52,9 +81,8 @@ namespace testDrm
 
 		ModeInfo originalMode;
 
-		public IntPtr Connector;
-		public IntPtr Crtc;
-		public IntPtr Encoder;
+		public IntPtr Connector, Crtc, Encoder;
+		unsafe ModeCrtc* saved_crtc;
 		unsafe ModeConnector* pConnector { get { return (ModeConnector*)Connector; } }
 		unsafe ModeCrtc* pCrtc { get { return (ModeCrtc*)Crtc; } }
 		unsafe ModeEncoder* pEncoder { get { return (ModeEncoder*)Encoder; } }
@@ -62,18 +90,19 @@ namespace testDrm
 		Cairo.EGLDevice cairoDev;
 		Cairo.GLSurface cairoSurf;
 
-		public DrmDevice(string gpu_path = "/dev/dri/card0"){
-
+		public Application(string gpu_path = "/dev/dri/card0"){
+			DestroyFB = HandleDestroyFB;
+			DestroyFBPtr = Marshal.GetFunctionPointerForDelegate(DestroyFB);
 			PageFlip = HandlePageFlip;
-			PageFlipPtr = Marshal.GetFunctionPointerForDelegate(PageFlip);		
+			PageFlipPtr = Marshal.GetFunctionPointerForDelegate(PageFlip);
 
 			gbm_device = IntPtr.Zero;
 			egl_display = IntPtr.Zero;
 
-			fd = Libc.open(gpu_path, OpenFlags.ReadWrite | OpenFlags.CloseOnExec);
-			if (fd < 0)
+			fd_gpu = Libc.open(gpu_path, OpenFlags.ReadWrite | OpenFlags.CloseOnExec);
+			if (fd_gpu < 0)
 				throw new NotSupportedException("[KMS] Failed to open gpu");			
-			Console.WriteLine("[KMS] GPU '{0}' opened as fd:{1}", gpu_path, fd);
+			Console.WriteLine("[KMS] GPU '{0}' opened as fd:{1}", gpu_path, fd_gpu);
 
 			initDrm ();
 
@@ -84,17 +113,19 @@ namespace testDrm
 			initCairo ();
 
 			initInput ();
+
+			initCrow ();
 		}
 
 		#region init
 		unsafe void initDrm(){			
-			ModeRes* resources = (ModeRes*)Drm.ModeGetResources(fd);
+			ModeRes* resources = (ModeRes*)Drm.ModeGetResources(fd_gpu);
 			if (resources == null)
 				throw new NotSupportedException("[KMS] Drm.ModeGetResources failed.");
 
 			ModeConnector* connector = null;
 			for (int i = 0; i < resources->count_connectors; i++) {
-				connector = (ModeConnector*)Drm.ModeGetConnector (fd, *(resources->connectors + i));
+				connector = (ModeConnector*)Drm.ModeGetConnector (fd_gpu, *(resources->connectors + i));
 				if (connector != null) {
 					if (connector->connection == ModeConnection.Connected && connector->count_encoders > 0)
 						break;
@@ -106,14 +137,15 @@ namespace testDrm
 				throw new NotSupportedException("[KMS] No connected screen found");
 
 			Connector = (IntPtr)connector;
-			Encoder = Drm.ModeGetEncoder (fd, connector->encoder_id);
-			Crtc = Drm.ModeGetCrtc(fd, pEncoder->crtc_id);
+			Encoder = Drm.ModeGetEncoder (fd_gpu, connector->encoder_id);
+			Crtc = Drm.ModeGetCrtc(fd_gpu, pEncoder->crtc_id);
+			saved_crtc = (ModeCrtc*) Drm.ModeGetCrtc (fd_gpu, pEncoder->crtc_id);
 
 			originalMode = pCrtc->mode;
 			Console.WriteLine ("[DRM]: current mode = {0} X {1} at {2} Hz", originalMode.hdisplay, originalMode.vdisplay, originalMode.vrefresh);
 		}
 		void initGbm (){
-			gbm_device = Gbm.CreateDevice(fd);
+			gbm_device = Gbm.CreateDevice(fd_gpu);
 			if (gbm_device == IntPtr.Zero)
 				throw new NotSupportedException("[GBM] Failed to create GBM device");			
 
@@ -160,6 +192,7 @@ namespace testDrm
 			Console.WriteLine ("[EGL] Version: " +  Marshal.PtrToStringAuto (Egl.QueryString (egl_display, Egl.VERSION)));
 			Console.WriteLine ("[EGL] Vendor: " + Marshal.PtrToStringAuto (Egl.QueryString (egl_display, Egl.VENDOR)));
 			Console.WriteLine ("[EGL] Extensions: " + Marshal.PtrToStringAuto (Egl.QueryString (egl_display, Egl.EXTENSIONS)));
+			Console.WriteLine ("[EGL] Extensions: " + Marshal.PtrToStringAuto (Egl.QueryString(IntPtr.Zero, Egl.EXTENSIONS)));
 
 			if (!Egl.ChooseConfig(egl_display, attribList, configs, configs.Length, out num_configs) || num_configs == 0)
 				throw new NotSupportedException(String.Format("Failed to retrieve GraphicsMode, error {0}", Egl.GetError()));
@@ -193,9 +226,9 @@ namespace testDrm
 			cursor_default = CreateCursor(gbm_device, Cursors.Default);
 			cursor_empty = CreateCursor(gbm_device, Cursors.Empty);
 
-			SetCursor(MouseCursor.Default);
+			SetCursor(Cursors.Default);
 			unsafe {				
-				Drm.MoveCursor (fd, pEncoder->crtc_id, 50, 50);
+				Drm.MoveCursor (fd_gpu, pEncoder->crtc_id, 0, 0);
 			}
 		}
 
@@ -284,48 +317,92 @@ namespace testDrm
 			if (bo != BufferObject.Zero)
 			{
 				unsafe {
-					Drm.SetCursor (fd, pEncoder->crtc_id,
+					Console.WriteLine ("Cursor ({0},{1})", cursor.X, cursor.Y);
+					Drm.SetCursor (fd_gpu, pEncoder->crtc_id,
 						bo.Handle, bo.Width, bo.Height, cursor.X, cursor.Y);
 				}
 			}
 		}
 		#endregion
-		int x, y;
 
-		void drawR (Cairo.Context ctx, int inc, double r, double g, double b){
-			ctx.Rectangle (x+inc, y+inc, 200, 200);
-			ctx.SetSourceRGB (r, g, b);
-			ctx.Fill ();
+		int getFbFromBo (BufferObject bo){
+			int width = bo.Width;
+			int height = bo.Height;
+			int bpp = 32;
+			int depth = 24;
+			int stride = bo.Stride;
+			int hndBO = bo.Handle;
+
+			int fb;
+			int ret = Drm.ModeAddFB (fd_gpu, width, height,(byte)depth, (byte)bpp, stride, hndBO, out fb);
+			if (ret != 0)
+				throw new Exception ("[DRM]: ModeAddFB failed.");
+			bo.SetUserData ((IntPtr)fb, DestroyFBPtr);
+			return fb;
 		}
-		public void RenderingLoop(){
-			while (run){
+
+		public void Run(){
+			BufferObject bo;
+			int fb;
+
+			PollFD fds = new PollFD();
+			fds.fd = fd_gpu;
+			fds.events = PollFlags.In;
+
+			EventContext evctx = new EventContext();
+			evctx.version = EventContext.Version;
+			evctx.page_flip_handler = PageFlipPtr;
+
+			int timeout = -1;//block ? -1 : 0;
+
+			using (Cairo.Context ctx = new Cairo.Context (cairoSurf)) {
+				ctx.Rectangle (0, 0, originalMode.hdisplay, originalMode.vdisplay);
+				ctx.SetSourceRGB (0, 0, 0);
+				ctx.Fill ();
+			}
+
+			cairoSurf.SwapBuffers ();
+
+			bo = Gbm.LockFrontBuffer (gbm_surface);
+			fb = getFbFromBo (bo);
+
+			SetScanoutRegion (fb);
+
+			while (run){				
+				BufferObject next_bo;
+				bool update = false;
+
 				if (updateMousePos) {
 					lock (Sync) {
 						updateMousePos = false;
 						unsafe {	
-							Drm.MoveCursor (fd, pEncoder->crtc_id, MouseX, MouseY);
+							Drm.MoveCursor (fd_gpu, pEncoder->crtc_id, MouseX-8, MouseY-4);
 						}
 					}
 				}
 
-				if (x > 700) {
-					x = y = 0;
-				} else {
-					x+=1;
-					y+=1;
-				}
-				using (Cairo.Context ctx = new Cairo.Context (cairoSurf)) {
-					ctx.Rectangle (0, 0, 1024, 780);
-					ctx.SetSourceRGB (0, 0, 1);
-					ctx.Fill ();
-					drawR (ctx, 0, 0, 1, 0);
+				if (Monitor.TryEnter (CrowInterface.RenderMutex)) {
+					if (CrowInterface.IsDirty) {
+						CrowInterface.IsDirty = false;
+						update = true;
+						using (Cairo.Context ctx = new Cairo.Context (cairoSurf)) {
+							using (Cairo.Surface d = new Cairo.ImageSurface (CrowInterface.dirtyBmp, Cairo.Format.Argb32,
+								originalMode.hdisplay, originalMode.vdisplay, originalMode.hdisplay * 4)) {
+								ctx.SetSourceSurface (d, 0, 0);
+								ctx.Operator = Cairo.Operator.Source;
+								ctx.Paint ();
+							}
+						}
+					}
+					Monitor.Exit (CrowInterface.RenderMutex);
 				}
-				cairoSurf.Flush ();
 
-				cairoSurf.SwapBuffers ();
+				if (!update)
+					continue;
+				update = false;
 
-//				if (!Egl.SwapBuffers(egl_display, egl_surface))
-//					throw new NotSupportedException(string.Format("Failed to swap buffers for context {0} current. Error: {1}", gbm_device, Egl.GetError()));
+				cairoSurf.Flush ();
+				cairoSurf.SwapBuffers ();
 
 				if (Gbm.HasFreeBuffers (gbm_surface) == 0)
 					throw new Exception ("[GBM]: Out of free buffers.");
@@ -334,58 +411,47 @@ namespace testDrm
 				if (next_bo == BufferObject.Zero)
 					throw new Exception ("[GBM]: Failed to lock front buffer.");
 
-				int width = next_bo.Width;
-				int height = next_bo.Height;
-				int bpp = 32;
-				int depth = 24;
-				int stride = next_bo.Stride;
-				int hndBO = next_bo.Handle;
-
-				int next_fb;
-				int ret = Drm.ModeAddFB (fd, width, height,(byte)depth, (byte)bpp, stride, hndBO, out next_fb);
-				if (ret != 0)
-					throw new Exception ("[DRM]: ModeAddFB failed.");
-
-				SetScanoutRegion (next_fb);
+				fb = getFbFromBo (next_bo);
 
-				is_flip_queued = true;
 				unsafe{
-					ret = Drm.ModePageFlip (fd, pEncoder->crtc_id, next_fb, PageFlipFlags.FlipEvent, IntPtr.Zero);
-				}
-				if (ret < 0)
-					throw new Exception ("[DRM] Failed to enqueue framebuffer flip.");
+					int is_flip_queued = 1;
 
-				PollFD fds = new PollFD();
-				fds.fd = fd;
-				fds.events = PollFlags.In;
+					while (Drm.ModePageFlip (fd_gpu, pEncoder->crtc_id, fb, PageFlipFlags.FlipEvent, ref is_flip_queued) < 0) {
+						//Console.WriteLine ("[DRM] Failed to enqueue framebuffer flip.");				
+						continue;
+					}
 
-				EventContext evctx = new EventContext();
-				evctx.version = EventContext.Version;
-				evctx.page_flip_handler = PageFlipPtr;
+					while (is_flip_queued != 0)
+					{
+						fds.revents = 0;
+						if (Libc.poll (ref fds, 1, timeout) < 0)
+							break;						
 
-				int timeout = -1;//block ? -1 : 0;
+						if ((fds.revents & (PollFlags.Hup | PollFlags.Error)) != 0)
+							break;
 
-				while (is_flip_queued)
-				{
-					fds.revents = 0;
-					if (Libc.poll(ref fds, 1, timeout) < 0)
-						break;
+						if ((fds.revents & PollFlags.In) != 0)
+							Drm.HandleEvent (fd_gpu, ref evctx);
+						else
+							break;
+					}
+//					if (is_flip_queued != 0)
+//						Console.WriteLine ("flip canceled");
+					
+					Gbm.ReleaseBuffer (gbm_surface, bo);
+					Drm.ModeRmFB(fd_gpu, fb);
 
-					if ((fds.revents & (PollFlags.Hup | PollFlags.Error)) != 0)
-						break;
+					bo = next_bo;
+					next_bo = BufferObject.Zero;
 
-					if ((fds.revents & PollFlags.In) != 0)
-						Drm.HandleEvent(fd, ref evctx);
-					else
-						break;
 				}
 			}
 		}
 
 		#region rendering
-		BufferObject bo, next_bo;
-		int fb, next_fb;
-		bool is_flip_queued;
+
+
+
 		// We only support a SwapInterval of 0 (immediate)
 		// or 1 (vsynced).
 		// Todo: add support for SwapInterval of -1 (adaptive).
@@ -395,112 +461,23 @@ namespace testDrm
 		readonly IntPtr PageFlipPtr;
 		readonly PageFlipCallback PageFlip;
 
-		void HandlePageFlip(int fd,	int sequence, int tv_sec, int tv_usec, IntPtr user_data)
+		readonly IntPtr DestroyFBPtr;
+		readonly DestroyUserDataCallback DestroyFB;
+
+		void HandlePageFlip(int fd,	int sequence, int tv_sec, int tv_usec, ref int user_data)
 		{
-			is_flip_queued = false;
-			if (fb != 0)
-				Drm.ModeRmFB (fd, fb);
-			fb = next_fb;
-			next_fb = 0;
-			if (bo != BufferObject.Zero)
-				Gbm.ReleaseBuffer (gbm_surface, bo);
-			bo = next_bo;
-			next_bo = BufferObject.Zero;
+			user_data = 0;
 		}
 
-		static readonly DestroyUserDataCallback DestroyFB = HandleDestroyFB;
-		static void HandleDestroyFB(BufferObject bo, IntPtr data)
+
+		void HandleDestroyFB(BufferObject bo, IntPtr data)
 		{
+			Console.WriteLine ("DestroyFB");
 			IntPtr gbm = bo.Device;
 			int fb = data.ToInt32();
-			Debug.Print("[KMS] Destroying framebuffer {0}", fb);
 
 			if (fb != 0)
-				Drm.ModeRmFB(Gbm.DeviceGetFD(gbm), fb);
-		}
-
-		public void SwapBuffers()
-		{
-			if (!Egl.SwapBuffers(egl_display, egl_surface))
-				throw new NotSupportedException(string.Format("Failed to swap buffers for context {0} current. Error: {1}", gbm_device, Egl.GetError()));
-			
-			if (is_flip_queued)
-			{
-				// Todo: if we don't wait for the page flip,
-				// we drop all rendering buffers and get a crash
-				// in Egl.SwapBuffers(). We need to fix that
-				// before we can disable vsync.
-				WaitFlip(true); // WaitFlip(SwapInterval > 0)
-				if (is_flip_queued)
-				{
-					Debug.Print("[KMS] Dropping frame");
-					return;
-				}
-			}
-
-			next_bo = Gbm.LockFrontBuffer (gbm_surface);
-			int fb = GetFramebuffer(next_bo);
-			QueueFlip(fb);
-		}
-
-		public void Update()
-		{
-			WaitFlip(true);
-
-			if (!Egl.SwapBuffers(egl_display, egl_surface))
-				throw new NotSupportedException(string.Format("Failed to swap buffers for context {0} current. Error: {1}", gbm_device, Egl.GetError()));
-
-			bo = Gbm.LockFrontBuffer (gbm_surface);
-			int fb = GetFramebuffer(bo);
-			SetScanoutRegion(fb);
-		}
-
-
-		void WaitFlip(bool block)
-		{
-			PollFD fds = new PollFD();
-			fds.fd = fd;
-			fds.events = PollFlags.In;
-
-			EventContext evctx = new EventContext();
-			evctx.version = EventContext.Version;
-			evctx.page_flip_handler = PageFlipPtr;
-
-			int timeout = block ? -1 : 0;
-
-			while (is_flip_queued)
-			{
-				fds.revents = 0;
-				if (Libc.poll(ref fds, 1, timeout) < 0)
-					break;
-
-				if ((fds.revents & (PollFlags.Hup | PollFlags.Error)) != 0)
-					break;
-
-				if ((fds.revents & PollFlags.In) != 0)
-					Drm.HandleEvent(fd, ref evctx);
-				else
-					break;
-			}
-
-			// Page flip has taken place, update buffer objects
-			if (!is_flip_queued)
-			{				
-				Gbm.ReleaseBuffer(gbm_surface, bo);
-				bo = next_bo;
-			}
-		}
-
-		void QueueFlip(int buffer)
-		{
-			unsafe
-			{
-				int ret = Drm.ModePageFlip (fd, pEncoder->crtc_id, buffer, PageFlipFlags.FlipEvent, IntPtr.Zero);
-				if (ret < 0)
-					Debug.Print("[KMS] Failed to enqueue framebuffer flip. Error: {0}", ret);
-
-				is_flip_queued = true;
-			}
+				Drm.ModeRmFB(fd_gpu, fb);
 		}
 
 		void SetScanoutRegion(int buffer)
@@ -511,60 +488,13 @@ namespace testDrm
 				int connector_id = pConnector->connector_id;
 				int crtc_id = pEncoder->crtc_id;
 
-				int x = 0;
-				int y = 0;
-				int connector_count = 1;
-				int ret = Drm.ModeSetCrtc(fd, crtc_id, buffer, x, y, &connector_id, connector_count, mode);
+				int ret = Drm.ModeSetCrtc (fd_gpu, crtc_id, buffer, 0, 0, &connector_id, 1, mode);
 
 				if (ret != 0)
-				{
-					Debug.Print("[KMS] Drm.ModeSetCrtc{0}, {1}, {2}, {3}, {4:x}, {5}, {6:x}) failed. Error: {7}",
-						fd, crtc_id, buffer, x, y, (IntPtr)connector_id, connector_count, (IntPtr)mode, ret);
-				}
+					Debug.Print("[KMS] Drm.ModeSetCrtc{0}, {1}, {2} failed. Error: {3}",
+						fd_gpu, crtc_id, buffer, ret);				
 			}
 		}
-			
-		int GetFramebuffer(BufferObject bo)
-		{
-			if (bo == BufferObject.Zero)
-				goto fail;
-
-			int bo_handle = bo.Handle;
-			if (bo_handle == 0)
-			{
-				Debug.Print("[KMS] Gbm.BOGetHandle({0:x}) failed.", bo);
-				goto fail;
-			}
-
-			int width = bo.Width;
-			int height = bo.Height;
-			int bpp = 32;
-			int depth = 24;
-			int stride = bo.Stride;
-
-			if (width == 0 || height == 0 || bpp == 0)
-			{
-				Debug.Print("[KMS] Invalid framebuffer format: {0}x{1} {2} {3} {4}",
-					width, height, stride, bpp, depth);
-				goto fail;
-			}
-
-			int buffer;
-			int ret = Drm.ModeAddFB (fd, width, height,(byte)depth, (byte)bpp, stride, bo_handle,out buffer);
-			if (ret != 0)
-			{
-				Debug.Print("[KMS] Drm.ModeAddFB({0}, {1}, {2}, {3}, {4}, {5}, {6}) failed. Error: {7}",
-					fd, width, height, depth, bpp, stride, bo_handle, ret);
-				goto fail;
-			}
-
-			bo.SetUserData((IntPtr)buffer, DestroyFB);
-			return buffer;
-
-			fail:
-			Debug.Print("[Error] Failed to create framebuffer.");
-			return -1;
-		}
 		#endregion
 
 		#region IDisposable implementation
@@ -574,14 +504,14 @@ namespace testDrm
 			cairoSurf.Dispose ();
 			cairoDev.Dispose ();
 
-			if (fb != 0)
-				Drm.ModeRmFB (fd, fb);
-			if (bo != BufferObject.Zero)
-				Gbm.ReleaseBuffer (gbm_surface, bo);			
-			if (next_fb != 0)
-				Drm.ModeRmFB (fd, next_fb);
-			if (next_bo != BufferObject.Zero)
-				Gbm.ReleaseBuffer (gbm_surface, next_bo);			
+//			if (fb != 0)
+//				Drm.ModeRmFB (fd_gpu, fb);
+//			if (bo != BufferObject.Zero)
+//				Gbm.ReleaseBuffer (gbm_surface, bo);			
+//			if (next_fb != 0)
+//				Drm.ModeRmFB (fd_gpu, next_fb);
+//			if (next_bo != BufferObject.Zero)
+//				Gbm.ReleaseBuffer (gbm_surface, next_bo);			
 
 			if (Egl.GetCurrentContext () == egl_ctx) {
 				Console.WriteLine ("destroying context");
@@ -591,23 +521,29 @@ namespace testDrm
 
 			cairoDev.Dispose ();
 
+			unsafe{
+				Drm.ModeSetCrtc (fd_gpu, saved_crtc->crtc_id, saved_crtc->buffer_id,
+					saved_crtc->x, saved_crtc->y, &pConnector->connector_id, 1, &saved_crtc->mode);
+				Drm.ModeFreeCrtc ((IntPtr)saved_crtc);
+			}
+
 			Drm.ModeFreeCrtc (Crtc);
 			Drm.ModeFreeConnector(Connector);
 			Drm.ModeFreeEncoder(Encoder);
-			Libc.close(fd);
+			Libc.close(fd_gpu);
 		}
 		#endregion
 
 		#region tests
 		unsafe void dumpDrmResources(){
-			ModeRes* resources = (ModeRes*)Drm.ModeGetResources(fd);
+			ModeRes* resources = (ModeRes*)Drm.ModeGetResources(fd_gpu);
 			if (resources == null)
 				throw new NotSupportedException("[KMS] Drm.ModeGetResources failed.");
 			Console.WriteLine("[KMS] DRM found {0} connectors", resources->count_connectors);
 
 			Console.WriteLine ("[ENCODERS]");
 			for (int j = 0; j < resources->count_encoders; j++) {							
-				ModeEncoder* e = (ModeEncoder*)Drm.ModeGetEncoder(fd, *(resources->encoders + j));
+				ModeEncoder* e = (ModeEncoder*)Drm.ModeGetEncoder(fd_gpu, *(resources->encoders + j));
 
 				if (e == null)
 					continue;
@@ -620,7 +556,7 @@ namespace testDrm
 			ModeConnector* connector = null;
 			for (int i = 0; i < resources->count_connectors; i++)
 			{
-				connector = (ModeConnector*)Drm.ModeGetConnector(fd, *(resources->connectors + i));
+				connector = (ModeConnector*)Drm.ModeGetConnector(fd_gpu, *(resources->connectors + i));
 				if (connector != null)
 				{
 					Console.WriteLine ("{0}\t{1}\t{2}\t{3}",
@@ -644,68 +580,6 @@ namespace testDrm
 				}
 			}
 		}
-
-		unsafe static void GetModes(LinuxDisplay display, DisplayResolution[] modes, out DisplayResolution current)
-		{
-			int mode_count = display.pConnector->count_modes;
-			Console.WriteLine("[KMS] Display supports {0} mode(s)", mode_count);
-			for (int i = 0; i < mode_count; i++)
-			{
-				ModeInfo* mode = display.pConnector->modes + i;
-				if (mode != null)
-				{
-					Console.WriteLine("Mode {0}: {1}x{2} @{3}", i,
-						mode->hdisplay, mode->vdisplay, mode->vrefresh);
-					DisplayResolution res = GetDisplayResolution(mode);
-					modes[i] = res;
-				}
-			}
-
-			if (display.pCrtc->mode_valid != 0)
-			{
-				ModeInfo cmode = display.pCrtc->mode;
-				current = GetDisplayResolution(&cmode);
-			}
-			else
-			{
-				current = GetDisplayResolution(display.pConnector->modes);
-			}
-			Console.WriteLine("Current mode: {0}", current.ToString());
-		}
-		unsafe static DisplayResolution GetDisplayResolution(ModeInfo* mode)
-		{
-			return new DisplayResolution(
-				0, 0,
-				mode->hdisplay, mode->vdisplay,
-				32, // This is actually part of the framebuffer, not the DisplayResolution
-				mode->vrefresh);
-		}
-
-		unsafe static ModeInfo* GetModeInfo(LinuxDisplay display, DisplayResolution resolution)
-		{
-			for (int i = 0; i < display.pConnector->count_modes; i++)
-			{
-				ModeInfo* mode = display.pConnector->modes + i;
-				if (mode != null &&
-					mode->hdisplay == resolution.Width &&
-					mode->vdisplay == resolution.Height)
-				{
-					return mode;
-				}
-			}
-			return null;
-		}
-
-		SurfaceFormat GetSurfaceFormat()
-		{
-			int format;
-			Egl.GetConfigAttrib(egl_display, egl_config,
-				Egl.NATIVE_VISUAL_ID, out format);
-			if (format == 0)
-				throw new Exception ("[KMS] Failed to retrieve EGL visual from GBM surface. Error: " + Egl.GetError());
-
-			return (SurfaceFormat)format;
-		}
 		#endregion
 
 		#region INPUT
@@ -894,12 +768,12 @@ namespace testDrm
 //						HandlePointerAxis(GetMouse(device), LibInput.GetPointerEvent(pevent));
 //						break;
 //
-//					case InputEventType.PointerButton:
-//						HandlePointerButton(GetMouse(device), LibInput.GetPointerEvent(pevent));
-//						break;
+					case InputEventType.PointerButton:
+						handlePointerButton (LibInput.GetPointerEvent(pevent));
+						break;
 
 					case InputEventType.PointerMotion:
-						HandlePointerMotion(LibInput.GetPointerEvent(pevent));
+						handlePointerMotion (LibInput.GetPointerEvent(pevent));
 						break;
 
 //					case InputEventType.PointerMotionAbsolute:
@@ -914,13 +788,49 @@ namespace testDrm
 		int MouseX = 0, MouseY = 0;
 		volatile bool updateMousePos = true;
 
-		void HandlePointerMotion(PointerEvent e)
-		{			
-			MouseX += (int)e.DeltaX;
-			MouseY += (int)e.DeltaY;
-			updateMousePos = true;
+		int roundDelta (double d){
+			return d > 0 ? (int)Math.Ceiling(d) : (int)Math.Floor (d);
 		}
 
+		void handlePointerMotion(PointerEvent e)
+		{
+			MouseX += roundDelta (e.DeltaX);
+			MouseY += roundDelta (e.DeltaY);
+
+			Rectangle bounds = CrowInterface.ClientRectangle;
+			if (MouseX < bounds.Left)
+				MouseX = bounds.Left;
+			else if (MouseX > bounds.Right)
+				MouseX = bounds.Right;
+
+			if (MouseY < bounds.Top)
+				MouseY = bounds.Top;
+			else if (MouseY > bounds.Bottom)
+				MouseY = bounds.Bottom;
+			
+			CrowInterface.ProcessMouseMove (MouseX, MouseY);
+
+			updateMousePos = true;
+		}
+		void handlePointerButton (PointerEvent e)
+		{			
+			int but = 0;
+			switch (e.Button) {
+			case EvdevButton.LEFT:
+				but = 0;
+				break;
+			case EvdevButton.MIDDLE:
+				but = 1;
+				break;
+			case EvdevButton.RIGHT:
+				but = 2;
+				break;
+			}
+			if (e.ButtonState == OpenTK.Platform.Linux.ButtonState.Pressed)
+				CrowInterface.ProcessMouseButtonDown (but);
+			else
+				CrowInterface.ProcessMouseButtonUp (but);
+		}
 		#endregion
 	}
 }
diff --git a/testDrm/src/Linux/Bindings/Drm.cs b/testDrm/src/Linux/Bindings/Drm.cs
index 449dc0b4..684a2d27 100644
--- a/testDrm/src/Linux/Bindings/Drm.cs
+++ b/testDrm/src/Linux/Bindings/Drm.cs
@@ -4,8 +4,9 @@
 //
 // Author:
 //       Stefanos A. <stapostol@gmail.com>
+//		 Bruyère JP	 <jp_bruyere@hotmail.com>
 //
-// Copyright (c) 2006-2014 Stefanos Apostolopoulos
+// Copyright (c) 2006-2017 Stefanos Apostolopoulos
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +33,7 @@ using System.Runtime.InteropServices;
 
 #pragma warning disable 0649 // field is never assigned
 
-namespace OpenTK.Platform.Linux
+namespace Crow.Linux
 {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     delegate void VBlankCallback(int fd,
@@ -46,7 +47,7 @@ namespace OpenTK.Platform.Linux
         int sequence,
         int tv_sec,
         int tv_usec,
-        IntPtr user_data);
+		ref int user_data);
 
     class Drm
     {
@@ -86,7 +87,7 @@ namespace OpenTK.Platform.Linux
 
         [DllImport(lib, EntryPoint = "drmModePageFlip", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ModePageFlip(int fd, int crtc_id, int fb_id,
-            PageFlipFlags flags, IntPtr user_data);
+			PageFlipFlags flags, ref int user_data);
 
         [DllImport(lib, EntryPoint = "drmModeSetCrtc", CallingConvention = CallingConvention.Cdecl)]
         unsafe public static extern int ModeSetCrtc(int fd, int crtcId, int bufferId,
@@ -97,7 +98,6 @@ namespace OpenTK.Platform.Linux
 
         [DllImport(lib, EntryPoint = "drmModeMoveCursor", CallingConvention = CallingConvention.Cdecl)]
         public static extern int MoveCursor(int fd, int crtcId, int x, int y);
-
     }
 
     enum ModeConnection
diff --git a/testDrm/src/Linux/Bindings/Gbm.cs b/testDrm/src/Linux/Bindings/Gbm.cs
index 03925742..a0659461 100644
--- a/testDrm/src/Linux/Bindings/Gbm.cs
+++ b/testDrm/src/Linux/Bindings/Gbm.cs
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace OpenTK.Platform.Linux
+namespace Crow.Linux
 {
     using Device = IntPtr; // struct gbm_device*
     using Surface = IntPtr;
@@ -68,7 +68,10 @@ namespace OpenTK.Platform.Linux
         public static extern int BOGetStride(IntPtr bo);
 
         [DllImport(lib, EntryPoint = "gbm_bo_set_user_data", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void BOSetUserData(IntPtr bo, IntPtr data, DestroyUserDataCallback callback);
+		public static extern void BOSetUserData(IntPtr bo, IntPtr data, IntPtr callback);
+
+//		[DllImport(lib, EntryPoint = "gbm_bo_get_user_data", CallingConvention = CallingConvention.Cdecl)]
+//		public static extern IntPtr BOGetUserData (IntPtr bo);
 
         [DllImport(lib, EntryPoint = "gbm_create_device", CallingConvention = CallingConvention.Cdecl)]
         public static extern Device CreateDevice(int fd);
@@ -206,7 +209,7 @@ namespace OpenTK.Platform.Linux
             }
         }
 
-        public void SetUserData(IntPtr data, DestroyUserDataCallback destroyFB)
+		public void SetUserData(IntPtr data, IntPtr destroyFB)
         {
             Gbm.BOSetUserData(buffer, data, destroyFB);
         }
diff --git a/testDrm/testDrm.csproj b/testDrm/testDrm.csproj
index 21b5bf37..0949f6b6 100644
--- a/testDrm/testDrm.csproj
+++ b/testDrm/testDrm.csproj
@@ -62,68 +62,11 @@
     <Compile Include="src\Egl.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="src\DrmDevice.cs" />
     <Compile Include="src\Linux\DefaultCursor.cs" />
     <Compile Include="src\MouseCursor.cs" />
     <Compile Include="src\WindowIcon.cs" />
-    <Compile Include="Mono.Cairo\Antialias.cs" />
-    <Compile Include="Mono.Cairo\Cairo.cs" />
-    <Compile Include="Mono.Cairo\CairoDebug.cs" />
-    <Compile Include="Mono.Cairo\Color.cs" />
-    <Compile Include="Mono.Cairo\Content.cs" />
-    <Compile Include="Mono.Cairo\Context.cs" />
-    <Compile Include="Mono.Cairo\DirectFBSurface.cs" />
-    <Compile Include="Mono.Cairo\Distance.cs" />
-    <Compile Include="Mono.Cairo\Extend.cs" />
-    <Compile Include="Mono.Cairo\FillRule.cs" />
-    <Compile Include="Mono.Cairo\Filter.cs" />
-    <Compile Include="Mono.Cairo\FontExtents.cs" />
-    <Compile Include="Mono.Cairo\FontFace.cs" />
-    <Compile Include="Mono.Cairo\FontOptions.cs" />
-    <Compile Include="Mono.Cairo\FontSlant.cs" />
-    <Compile Include="Mono.Cairo\FontType.cs" />
-    <Compile Include="Mono.Cairo\FontWeight.cs" />
-    <Compile Include="Mono.Cairo\Format.cs" />
-    <Compile Include="Mono.Cairo\GlitzSurface.cs" />
-    <Compile Include="Mono.Cairo\Glyph.cs" />
-    <Compile Include="Mono.Cairo\Gradient.cs" />
-    <Compile Include="Mono.Cairo\HintMetrics.cs" />
-    <Compile Include="Mono.Cairo\HintStyle.cs" />
-    <Compile Include="Mono.Cairo\ImageSurface.cs" />
-    <Compile Include="Mono.Cairo\LineCap.cs" />
-    <Compile Include="Mono.Cairo\LineJoin.cs" />
-    <Compile Include="Mono.Cairo\LinearGradient.cs" />
-    <Compile Include="Mono.Cairo\Matrix.cs" />
-    <Compile Include="Mono.Cairo\NativeMethods.cs" />
-    <Compile Include="Mono.Cairo\Operator.cs" />
-    <Compile Include="Mono.Cairo\PSSurface.cs" />
-    <Compile Include="Mono.Cairo\Path.cs" />
-    <Compile Include="Mono.Cairo\Pattern.cs" />
-    <Compile Include="Mono.Cairo\PatternType.cs" />
-    <Compile Include="Mono.Cairo\PdfSurface.cs" />
-    <Compile Include="Mono.Cairo\Point.cs" />
-    <Compile Include="Mono.Cairo\PointD.cs" />
-    <Compile Include="Mono.Cairo\RadialGradient.cs" />
-    <Compile Include="Mono.Cairo\Rectangle.cs" />
-    <Compile Include="Mono.Cairo\Region.cs" />
-    <Compile Include="Mono.Cairo\ScaledFont.cs" />
-    <Compile Include="Mono.Cairo\SolidPattern.cs" />
-    <Compile Include="Mono.Cairo\Status.cs" />
-    <Compile Include="Mono.Cairo\SubpixelOrder.cs" />
-    <Compile Include="Mono.Cairo\Surface.cs" />
-    <Compile Include="Mono.Cairo\SurfacePattern.cs" />
-    <Compile Include="Mono.Cairo\SurfaceType.cs" />
-    <Compile Include="Mono.Cairo\SvgSurface.cs" />
-    <Compile Include="Mono.Cairo\SvgVersion.cs" />
-    <Compile Include="Mono.Cairo\TextExtents.cs" />
-    <Compile Include="Mono.Cairo\Win32Surface.cs" />
-    <Compile Include="Mono.Cairo\XcbSurface.cs" />
-    <Compile Include="Mono.Cairo\XlibSurface.cs" />
-    <Compile Include="Mono.Cairo\Device.cs" />
-    <Compile Include="Mono.Cairo\GLSurface.cs" />
-    <Compile Include="Mono.Cairo\GLXDevice.cs" />
-    <Compile Include="Mono.Cairo\WGLDevice.cs" />
-    <Compile Include="Mono.Cairo\EGLDevice.cs" />
+    <Compile Include="src\Application.cs" />
+    <Compile Include="src\DRMDevice.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -133,7 +76,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="src\" />
-    <Folder Include="Mono.Cairo\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="src\Linux\LinuxFactory.cs" />
-- 
2.47.3