Switched away from gtk-declarative.

4 files changed, 40 insertions, 28 deletions

diff --git a/LambdaCube/Gtk.hs b/LambdaCube/Gtk.hs
new file mode 100644
index 0000000..1a9c1b9
--- /dev/null
+++ b/LambdaCube/Gtk.hs
@@ -0,0 +1,25 @@
+module LambdaCube.Gtk where
+
+import Control.Monad.IO.Class
+import qualified Graphics.Rendering.OpenGL as GL
+import qualified Unsafe.Coerce
+
+import LambdaCube.GL.Type
+
+
+-- | LambdaCube.GL assumes we are rendering to the default framebuffer #0 but
+-- Gtk.GLArea actually uses an unpredictable framebuffer object target.  As a
+-- workaround, we read the current framebuffer target and patch up the render
+-- commands to use it instead of 0.
+fixupRenderTarget :: MonadIO m => GLRenderer -> m GLRenderer
+fixupRenderTarget r = do
+    fbo0 <- GL.get $ GL.bindFramebuffer GL.DrawFramebuffer
+    let fbo = Unsafe.Coerce.unsafeCoerce fbo0 :: GL.GLuint -- XXX: Is there a better way to get this?
+        setFBO rt | framebufferObject rt == 0  = rt { framebufferObject = fbo }
+                  | otherwise                  = rt
+        updateDC dc = dc { glRenderTarget = rt' } where rt' = setFBO (glRenderTarget dc)
+        update (GLClearRenderTarget rt imgs) = GLClearRenderTarget (setFBO rt) imgs
+        update (GLRenderSlot dc s p)         = GLRenderSlot (updateDC dc) s p
+        update (GLRenderStream dc s p)       = GLRenderStream (updateDC dc) s p
+    return r { glCommands = map update (glCommands r) }
+
diff --git a/LambdaHello.hs b/LambdaHello.hs
index 78d4f0d..5615ca8 100644
--- a/LambdaHello.hs
+++ b/LambdaHello.hs
@@ -22,9 +22,7 @@ import qualified Data.Vector as V
 -- import qualified Backend as RF
 import LambdaCube.GL as RF
 import LambdaCube.GL.Type
-
-import Control.Monad.IO.Class
-import qualified Unsafe.Coerce
+import LambdaCube.Gtk
 
 data State = State
     { stConfig     :: Config
@@ -47,22 +45,6 @@ initState = do
         }
 
 
--- | LambdaCube.GL assumes we are rendering to the default framebuffer #0 but
--- Gtk.GLArea actually uses an unpredictable framebuffer object target.  As a
--- workaround, we read the current framebuffer target and patch up the render
--- commands to use it instead of 0.
-fixupRenderTarget :: MonadIO m => GLRenderer -> m GLRenderer
-fixupRenderTarget r = do
-    fbo0 <- GL.get $ GL.bindFramebuffer GL.DrawFramebuffer
-    let fbo = Unsafe.Coerce.unsafeCoerce fbo0 :: GL.GLuint -- XXX: Is there a better way to get this?
-        setFBO rt | framebufferObject rt == 0  = rt { framebufferObject = fbo }
-                  | otherwise                  = rt
-        updateDC dc = dc { glRenderTarget = rt' } where rt' = setFBO (glRenderTarget dc)
-        update (GLClearRenderTarget rt imgs) = GLClearRenderTarget (setFBO rt) imgs
-        update (GLRenderSlot dc s p)         = GLRenderSlot (updateDC dc) s p
-        update (GLRenderStream dc s p)       = GLRenderStream (updateDC dc) s p
-    return r { glCommands = map update (glCommands r) }
-
 render :: State -> GLArea -> GLContext -> IO Bool
 render st w gl = do
     mr <- tryTakeMVar (stRealized st)
diff --git a/lambda-gtk.cabal b/lambda-gtk.cabal
index 7d3889d..8fcf7e4 100644
--- a/lambda-gtk.cabal
+++ b/lambda-gtk.cabal
@@ -1,8 +1,4 @@
 cabal-version:       >=1.10
--- Initial package description 'lambda-gtk.cabal' generated by 'cabal
--- init'.  For further documentation, see
--- http://haskell.org/cabal/users-guide/
-
 name:                lambda-gtk
 version:             0.1.0.0
 -- synopsis:
@@ -11,16 +7,25 @@ version:             0.1.0.0
 license:             BSD3
 license-file:        LICENSE
 author:              Joe Crayne
-maintainer:          jim.crayne@gmail.com
+maintainer:          oh.hello.joe@gmail.com
 -- copyright:
 -- category:
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
 
 executable lambda-gtk
-  main-is:             GtkHello.hs
-  -- other-modules:
+  main-is:             gix.hs
+  other-modules:       LambdaCube.Gtk LambdaHello
+  extensions:          NondecreasingIndentation
   other-extensions:    OverloadedLabels, OverloadedLists, OverloadedStrings
-  build-depends:       base, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11, lambdacube-ir, lambdacube-gl, gi-gtk-declarative, gi-gtk, aeson, vector, gi-gtk-declarative-app-simple, JuicyPixels, gi-gdk
+  build-depends:       base, containers >=0.5 && <0.6, bytestring >=0.10 && <0.11,
+                       vector, aeson, JuicyPixels,
+                       -- rendering
+                       lambdacube-ir, lambdacube-gl, OpenGL,
+                       -- GUI
+                       gi-gdk , gi-glib , gi-gobject , gi-gtk , haskell-gi-base
+                       -- , gi-gtk-declarative, gi-gtk-declarative-app-simple,
+
   -- hs-source-dirs:
+
   default-language:    Haskell2010
diff --git a/run.sh b/run.sh
index 0df74ba..f004906 100755
--- a/run.sh
+++ b/run.sh
@@ -39,4 +39,4 @@
 #     Mesa may not really implement all the features of the given version. (for
 #     developers only)
 
-MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ./GtkHello
+MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ./gix