Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:25
|
Tue Jul 3 13:33:05 PDT 2007 Duncan Coutts <du...@ha...>
* Update Win32 build scripts
Both the scripts for building Gtk2Hs on Windows and the scripts used to
build a Gtk+ SDK for Windows. Now using Gtk+ 2.10.13 for the Windows builds.
hunk ./tools/win32/combine.sh 30
- rm -r include lib
hunk ./tools/win32/combine.sh 31
+ rm -r include
+ rm lib/*.lib
+ rm -r lib/pkgconfig
+ rm -r lib/*/include
+ rmdir lib/glib-2.0 lib/gtkglext-1.0
hunk ./tools/win32/combine.sh 39
-zip -q -r gtk+-dev-${GTK_VERSION}-win32.zip gtk+-dev-${GTK_VERSION}-win32/
+zip -9 -q -r gtk+-dev-${GTK_VERSION}-win32.zip gtk+-dev-${GTK_VERSION}-win32/
hunk ./tools/win32/combine.sh 43
-zip -q -r gtk+-${GTK_VERSION}-win32.zip gtk+-${GTK_VERSION}-win32/
+zip -9 -q -r gtk+-${GTK_VERSION}-win32.zip gtk+-${GTK_VERSION}-win32/
hunk ./tools/win32/download.sh 13
-wget -c $BASE_URL/pango/1.14/pango-${PANGO_VERSION}.zip || exit
-wget -c $BASE_URL/pango/1.14/pango-dev-${PANGO_VERSION}.zip || exit
+wget -c $BASE_URL/pango/1.16/pango-${PANGO_VERSION}.zip || exit
+wget -c $BASE_URL/pango/1.16/pango-dev-${PANGO_VERSION}.zip || exit
hunk ./tools/win32/download.sh 16
-wget -c $BASE_URL/atk/1.12/atk-${ATK_VERSION}.zip || exit
-wget -c $BASE_URL/atk/1.12/atk-dev-${ATK_VERSION}.zip || exit
+wget -c $BASE_URL/atk/1.18/atk-${ATK_VERSION}.zip || exit
+wget -c $BASE_URL/atk/1.18/atk-dev-${ATK_VERSION}.zip || exit
hunk ./tools/win32/download.sh 38
-wget -c http://www.zlatkovic.com/pub/libxml/oldreleases/libxml2-${LIBXML_VERSION}.win32.zip || exit
+wget -c $BASE_URL/dependencies/libxml2-dev-${LIBXML_VERSION}.zip || exit
hunk ./tools/win32/download.sh 44
+if test ${GTK_EXTRAS}
+then
+wget -c $BASE_URL/librsvg/2.16/librsvg-${LIBRSVG_VERSION}.zip
+wget -c $BASE_URL/librsvg/2.16/librsvg-dev-${LIBRSVG_VERSION}.zip
+wget -c $BASE_URL/librsvg/2.16/svg-gdk-pixbuf-loader-${LIBRSVG_VERSION}.zip
+
+wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-${SOURCEVIEW_VERSION}.zip
+wget -c $BASE_URL/gtksourceview/1.8/gtksourceview-dev-${SOURCEVIEW_VERSION}.zip
+fi
+
hunk ./tools/win32/fix.sh 12
-sed -i -e 's/Libs.private: -lz -lz -lm/Libs.private: -lz -lz -lm -lpng13/' lib/pkgconfig/cairo.pc
+sed -i -e 's/Libs.private: -lz -lm/Libs.private: -lm -lpng13/' lib/pkgconfig/cairo.pc
+sed -i -e 's/-lz//' lib/pkgconfig/cairo-pdf.pc
hunk ./tools/win32/fix.sh 20
-pushd gtk+-dev-${GTK_VERSION}
-sed -i -e 's/-user32/-luser32/' -e 's/-Wl,-luuid/-luuid/' lib/pkgconfig/*.pc
-popd
-
hunk ./tools/win32/fix.sh 32
-rm -r readme.txt include/
hunk ./tools/win32/fix.sh 34
-mkdir lib/pkgconfig
-cp ../../libxml-2.0.pc lib/pkgconfig/
+sed -i -e 's/-lz//' lib/pkgconfig/libxml-2.0.pc
hunk ./tools/win32/fix.sh 37
+if test ${GTK_EXTRAS}
+then
+pushd librsvg-dev-${LIBRSVG_VERSION}
+mv lib/librsvg-2.dll.a lib/rsvg-2.lib
+popd
+
+pushd gtksourceview-dev-${SOURCEVIEW_VERSION}
+mv lib/libgtksourceview-1.0.dll.a lib/gtksourceview-1.0.lib
+sed -i -e 's/libgnomeprint-2.2//' lib/pkgconfig/gtksourceview-1.0.pc [_$_]
+popd
+fi
hunk ./tools/win32/libxml-2.0.pc 1
-prefix=/ignore
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libXML
-Version: 2.6.20
-Description: libXML library version 2.
-Requires:
-Libs: -L${libdir} -lxml2
-Cflags:
rmfile ./tools/win32/libxml-2.0.pc
hunk ./tools/win32/prune.sh 58
+pushd libxml2-dev-${LIBXML_VERSION}
+rm -rf include
+popd
+
hunk ./tools/win32/unpack.sh 16
-rm -rf libxml2-dev-${LIBXML_VERSION}/
-mv libxml2-${LIBXML_VERSION}.win32 libxml2-dev-${LIBXML_VERSION}
-mv libxml2-dev-${LIBXML_VERSION}/libxml2-${LIBXML_VERSION}.win32/* libxml2-dev-${LIBXML_VERSION}/
-rmdir libxml2-dev-${LIBXML_VERSION}/libxml2-${LIBXML_VERSION}.win32/
-
hunk ./tools/win32/versions.conf 1
-GLIB_VERSION=2.12.9
-PANGO_VERSION=1.14.9
-ATK_VERSION=1.12.3
-CAIRO_VERSION=1.2.6
-GTK_VERSION=2.10.9
+GLIB_VERSION=2.12.12
+PANGO_VERSION=1.16.4
+ATK_VERSION=1.18.0
+CAIRO_VERSION=1.4.8
+GTK_VERSION=2.10.13
hunk ./tools/win32/versions.conf 12
-LIBXML_VERSION=2.6.20
+LIBXML_VERSION=2.6.27
hunk ./tools/win32/versions.conf 16
+if test ${GTK_EXTRAS}
+then
+LIBRSVG_VERSION=2.16.1
+SOURCEVIEW_VERSION=1.8.5
+fi
+
hunk ./tools/win32/win32-build-version.sh 8
- ghc-6.4.2) PATH="${PATH}:${GHC_642_PATH}";;[_^M_][_$_]
- ghc-6.6) PATH="${PATH}:${GHC_66_PATH}";;[_^M_][_$_]
- *) echo "GHC version parameter must be one of ghc-6.2.2, ghc-6.4.2 or ghc-6.6"; exit;;[_^M_][_$_]
+ ghc-6.4.2) PATH="${PATH}:${GHC_642_PATH}";;[_^M_][_$_]
+ ghc-6.6.1) PATH="${PATH}:${GHC_66_PATH}";;[_^M_][_$_]
+ *) echo "GHC version parameter must be one of ghc-6.2.2, ghc-6.4.2 or ghc-6.6.1"; exit;;[_^M_][_$_]
hunk ./tools/win32/win32-build-version.sh 40
+CONFIGURE_FLAGS="--enable-packager-mode --enable-split-objs --enable-libglade --enable-opengl"[_^M_][_$_]
+[_^M_][_$_]
hunk ./tools/win32/win32-build-version.sh 47
-./configure --enable-packager-mode --enable-split-objs --enable-libglade --prefix=/ ${CONFIGURE_EXTRAFLAGS}[_^M_][_$_]
+./configure --prefix=/ ${CONFIGURE_FLAGS} ${CONFIGURE_EXTRAFLAGS}[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 2
-VERSION=0.9.10.5[_^M_][_$_]
+VERSION=0.9.11.3[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 7
-INNOSETUP_BIN_DIR="e:/dcoutts/Inno Setup 5"[_^M_][_$_]
+INNOSETUP_BIN_DIR="d:/dcoutts/Inno Setup 5"[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 15
-GTK_26_BASEPATH="/e/dcoutts/gtk+-2.6.10"[_^M_][_$_]
-GTK_28_BASEPATH="/e/dcoutts/gtk+-2.8.20"[_^M_][_$_]
-GTK_210_BASEPATH="/e/dcoutts/gtk+-2.10.9"[_^M_][_$_]
+GTK_26_BASEPATH="/d/dcoutts/gtk+-2.6.10"[_^M_][_$_]
+GTK_28_BASEPATH="/d/dcoutts/gtk+-2.8.20"[_^M_][_$_]
+GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.13"[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 20
-GHC_622_PATH="/home/dcoutts/ghc-6.2.2/bin"[_^M_][_$_]
-GHC_642_PATH="/home/dcoutts/ghc-6.4.2/bin"[_^M_][_$_]
-GHC_66_PATH="/home/dcoutts/ghc-6.6/bin"[_^M_][_$_]
+GHC_622_PATH="/d/dcoutts/ghc-6.2.2/bin"[_^M_][_$_]
+GHC_642_PATH="/d/dcoutts/ghc-6.4.2/bin"[_^M_][_$_]
+GHC_661_PATH="/d/dcoutts/ghc-6.6.1/bin"[_^M_][_$_]
|
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:24
|
Tue Jul 3 13:16:48 PDT 2007 Duncan Coutts <du...@ha...>
* Unbreak SOE in the single threaded case again.
This is getting embarassing.
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 107
-runGraphics main = do
- Gtk.unsafeInitGUIForThreadedRTS
- forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
- if rtsSupportsBoundThreads
- then Gtk.mainGUI
- else let loop = do
- yield
- quit <- Gtk.mainIteration
- if quit then return ()
- else loop
- in do loop
- -- give any windows a chance to close
- Gtk.flush
+runGraphics main
+ | rtsSupportsBoundThreads = do
+ Gtk.unsafeInitGUIForThreadedRTS
+ forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
+ Gtk.mainGUI
+ | otherwise = do
+ Gtk.initGUI
+ quitVar <- newIORef False
+ forkIO (main >> writeIORef quitVar True)
+ let loop = do
+ yield
+ Gtk.mainIteration
+ quit <- readIORef quitVar
+ if quit then return ()
+ else loop
+ loop
+ -- give any windows a chance to close
+ Gtk.flush
|
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:22
|
Tue Jul 3 13:29:05 PDT 2007 Duncan Coutts <du...@ha...>
* Add a few people who contributed to this release to the AUTHORS file
hunk ./AUTHORS 36
+
+Toby Allsopp <to...@mi...>
+(work on cairo ps & psf backends)
+
+Malte Milatz <ma...@gm...>
+(cairo matrix documentation)
+
+Maxime Henrion <mu...@Fr...>
+(ColorSelectionDialog improvements)
|
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:20
|
Tue Jul 3 13:18:11 PDT 2007 Duncan Coutts <du...@ha...>
* sed hackery to generate extra-ghci-libraries in package files on win32
The .lib names and .dll names on windows do not match up, so we have to
specify different libraries for ghci than for ghc. eg for gtk-2.0.lib
the corresponding dll is libgtk-2.0-0.dll. We do this conversion using
a sed rule plus a short list of hard-coded exceptions.
hunk ./Makefile.am 1858
+#
+# Annother annoying thing is that the .lib names and .dll names on windows do
+# not match up, so we have to specify different libraries for ghci than for
+# ghc. Eg while it's gtk-2.0.lib it's libgtk-2.0-0.dll.
+# We generate the "extra-ghci-libraries:" field from the "extra-libraries:"
+# field using a bit of cunning sed hackery.
hunk ./Makefile.am 1868
+ -e '/^extra-libraries:/ \
+ p; \
+ s/extra-libraries/extra-ghci-libraries/; \
+ s/"\([a-z0-9.-]*\.0\)"/"lib\1-0"/g; \
+ s/"cairo"/"libcairo-2"/; \
+ s/"rsvg-2"/"librsvg-2-2"/; \
+ s/"xml2"/"libxml2"/' \
|
|
From: Duncan C. <dun...@wo...> - 2007-07-04 15:34:19
|
Tue Jul 3 13:16:48 PDT 2007 Duncan Coutts <du...@ha...>
* Unbreak SOE in the single threaded case again.
This is getting embarassing.
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 107
-runGraphics main = do
- Gtk.unsafeInitGUIForThreadedRTS
- forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
- if rtsSupportsBoundThreads
- then Gtk.mainGUI
- else let loop = do
- yield
- quit <- Gtk.mainIteration
- if quit then return ()
- else loop
- in do loop
- -- give any windows a chance to close
- Gtk.flush
+runGraphics main
+ | rtsSupportsBoundThreads = do
+ Gtk.unsafeInitGUIForThreadedRTS
+ forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
+ Gtk.mainGUI
+ | otherwise = do
+ Gtk.initGUI
+ quitVar <- newIORef False
+ forkIO (main >> writeIORef quitVar True)
+ let loop = do
+ yield
+ Gtk.mainIteration
+ quit <- readIORef quitVar
+ if quit then return ()
+ else loop
+ loop
+ -- give any windows a chance to close
+ Gtk.flush
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 23:17:27
|
Sat Jun 30 09:22:14 PDT 2007 Duncan Coutts <du...@ha...>
* Ugg, unbreak SOE in the non-threaded rts case.
hunk ./TODO 16
- * make SOE give an error in GHCi since it uses threads.
-
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 91
-import Control.Concurrent (forkIO, yield)
+import Control.Concurrent (forkIO, yield, rtsSupportsBoundThreads)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 110
- Gtk.mainGUI
+ if rtsSupportsBoundThreads
+ then Gtk.mainGUI
+ else let loop = do
+ yield
+ quit <- Gtk.mainIteration
+ if quit then return ()
+ else loop
+ in do loop
+ -- give any windows a chance to close
+ Gtk.flush
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 23:17:27
|
Sat Jun 30 09:22:14 PDT 2007 Duncan Coutts <du...@ha...>
* Ugg, unbreak SOE in the non-threaded rts case.
hunk ./TODO 16
- * make SOE give an error in GHCi since it uses threads.
-
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 91
-import Control.Concurrent (forkIO, yield)
+import Control.Concurrent (forkIO, yield, rtsSupportsBoundThreads)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 110
- Gtk.mainGUI
+ if rtsSupportsBoundThreads
+ then Gtk.mainGUI
+ else let loop = do
+ yield
+ quit <- Gtk.mainIteration
+ if quit then return ()
+ else loop
+ in do loop
+ -- give any windows a chance to close
+ Gtk.flush
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 00:40:00
|
Fri Jun 29 17:03:26 PDT 2007 Duncan Coutts <du...@ha...>
* Make the check for the GThread system being initialised more robust
We previously used an evil top level IORef however in GHCi that does
not work because that state gets reverted when we :reload, and so we
end up calling g_thread_init again which aborts.
So now we have a little C wrapper around the g_thread_supported macro
and we use that to check if g_thread_init was already done.
hunk ./Makefile.am 21
+ gtk/Graphics/UI/Gtk/General/hsgthread.h \
hunk ./Makefile.am 421
+ gtk/Graphics/UI/Gtk/General/hsgthread.c \
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 160
-{-# NOINLINE gthreadsInitialisedRef #-}
-gthreadsInitialisedRef :: IORef Bool
-gthreadsInitialisedRef = unsafePerformIO (newIORef False)
-
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 161
--- we've got to keep track of whether or not we've called it already, hence
--- the ugly top-level IORef trick. Sigh.
+-- we've got to keep track of whether or not we've called it already. Sigh.
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 165
- gthreadsInitialised <- readIORef gthreadsInitialisedRef
+ gthreadsInitialised <- liftM (toBool . fromIntegral) gtk2hs_thread_supported
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 168
- writeIORef gthreadsInitialisedRef True
+
+foreign import ccall "hsgthread.h gtk2hs_thread_supported"
+ gtk2hs_thread_supported :: IO CInt
addfile ./gtk/Graphics/UI/Gtk/General/hsgthread.c
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 1
+/* Annoyingly, g_thread_supported is actuall a macro so we need this silly
+ * little wrapper functions. Grrr. */
+
+#include <glib/gthread.h>
+
+int gtk2hs_thread_supported () {
+ return g_thread_supported();
+}
addfile ./gtk/Graphics/UI/Gtk/General/hsgthread.h
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.h 1
+/* g_thread_supported wrapper function */
+
+int gtk2hs_thread_supported ();
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 00:39:59
|
Fri Jun 29 11:21:28 PDT 2007 Duncan Coutts <du...@ha...>
* More SOE fixes
The main loop now uses a single call to mainGUI which makes threading simpler.
Mouse button release events are now collected as well as button down ones.
Don't specify position of the window for the BouncingBall demo; having it
appear at (800,800) is not very helpful on a 1024x768 screen :-)
hunk ./demo/soe/BouncingBall.hs 9
- do w <- openWindowEx "Bouncing Ball" (Just (800,800)) (Just (200, 600)) drawBufferedGraphic (Just 30)
+ do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic (Just 30)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 109
- quitVar <- newIORef False
- forkIO (main >> writeIORef quitVar True)
- let loop = do
- yield
- Gtk.mainIteration
- quit <- readIORef quitVar
- if quit then return ()
- else loop
- loop
- -- give any windows a chance to close
- Gtk.flush
- return ()
+ forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
+ Gtk.mainGUI
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 203
+ Gtk.widgetHide window
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 211
- Gtk.onButtonPress canvas $ \event@Gtk.Button { Gtk.eventX=x, Gtk.eventY=y } ->
- writeChan eventsChan Button {
- pt = (round x,round y),
- isLeft = Gtk.eventButton event == Gtk.LeftButton,
- isDown = case Gtk.eventClick event of
- Gtk.ReleaseClick -> False
- _ -> True
- } >> return True
+ let mouseButtonHandler event@Gtk.Button { Gtk.eventX=x, Gtk.eventY=y } = do
+ writeChan eventsChan Button {
+ pt = (round x,round y),
+ isLeft = Gtk.eventButton event == Gtk.LeftButton,
+ isDown = case Gtk.eventClick event of
+ Gtk.ReleaseClick -> False
+ _ -> True
+ }
+ return True
+ Gtk.onButtonPress canvas mouseButtonHandler
+ Gtk.onButtonRelease canvas mouseButtonHandler
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 00:38:44
|
Fri Jun 29 17:03:26 PDT 2007 Duncan Coutts <du...@ha...>
* Make the check for the GThread system being initialised more robust
We previously used an evil top level IORef however in GHCi that does
not work because that state gets reverted when we :reload, and so we
end up calling g_thread_init again which aborts.
So now we have a little C wrapper around the g_thread_supported macro
and we use that to check if g_thread_init was already done.
hunk ./Makefile.am 21
+ gtk/Graphics/UI/Gtk/General/hsgthread.h \
hunk ./Makefile.am 421
+ gtk/Graphics/UI/Gtk/General/hsgthread.c \
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 160
-{-# NOINLINE gthreadsInitialisedRef #-}
-gthreadsInitialisedRef :: IORef Bool
-gthreadsInitialisedRef = unsafePerformIO (newIORef False)
-
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 161
--- we've got to keep track of whether or not we've called it already, hence
--- the ugly top-level IORef trick. Sigh.
+-- we've got to keep track of whether or not we've called it already. Sigh.
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 165
- gthreadsInitialised <- readIORef gthreadsInitialisedRef
+ gthreadsInitialised <- liftM (toBool . fromIntegral) gtk2hs_thread_supported
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 168
- writeIORef gthreadsInitialisedRef True
+
+foreign import ccall "hsgthread.h gtk2hs_thread_supported"
+ gtk2hs_thread_supported :: IO CInt
addfile ./gtk/Graphics/UI/Gtk/General/hsgthread.c
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.c 1
+/* Annoyingly, g_thread_supported is actuall a macro so we need this silly
+ * little wrapper functions. Grrr. */
+
+#include <glib/gthread.h>
+
+int gtk2hs_thread_supported () {
+ return g_thread_supported();
+}
addfile ./gtk/Graphics/UI/Gtk/General/hsgthread.h
hunk ./gtk/Graphics/UI/Gtk/General/hsgthread.h 1
+/* g_thread_supported wrapper function */
+
+int gtk2hs_thread_supported ();
|
|
From: Duncan C. <dun...@wo...> - 2007-06-30 00:38:44
|
Fri Jun 29 11:21:28 PDT 2007 Duncan Coutts <du...@ha...>
* More SOE fixes
The main loop now uses a single call to mainGUI which makes threading simpler.
Mouse button release events are now collected as well as button down ones.
Don't specify position of the window for the BouncingBall demo; having it
appear at (800,800) is not very helpful on a 1024x768 screen :-)
hunk ./demo/soe/BouncingBall.hs 9
- do w <- openWindowEx "Bouncing Ball" (Just (800,800)) (Just (200, 600)) drawBufferedGraphic (Just 30)
+ do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic (Just 30)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 109
- quitVar <- newIORef False
- forkIO (main >> writeIORef quitVar True)
- let loop = do
- yield
- Gtk.mainIteration
- quit <- readIORef quitVar
- if quit then return ()
- else loop
- loop
- -- give any windows a chance to close
- Gtk.flush
- return ()
+ forkIO (main >> Gtk.postGUIAsync Gtk.mainQuit)
+ Gtk.mainGUI
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 203
+ Gtk.widgetHide window
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 211
- Gtk.onButtonPress canvas $ \event@Gtk.Button { Gtk.eventX=x, Gtk.eventY=y } ->
- writeChan eventsChan Button {
- pt = (round x,round y),
- isLeft = Gtk.eventButton event == Gtk.LeftButton,
- isDown = case Gtk.eventClick event of
- Gtk.ReleaseClick -> False
- _ -> True
- } >> return True
+ let mouseButtonHandler event@Gtk.Button { Gtk.eventX=x, Gtk.eventY=y } = do
+ writeChan eventsChan Button {
+ pt = (round x,round y),
+ isLeft = Gtk.eventButton event == Gtk.LeftButton,
+ isDown = case Gtk.eventClick event of
+ Gtk.ReleaseClick -> False
+ _ -> True
+ }
+ return True
+ Gtk.onButtonPress canvas mouseButtonHandler
+ Gtk.onButtonRelease canvas mouseButtonHandler
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 19:47:16
|
I see that we need to make it clear which branch/repo these commits are for. I think the script that the ghc repos use does that, so I'll borrow that code. On Thu, 2007-06-28 at 10:24 -0700, Duncan Coutts wrote: > Thu Jun 28 10:22:07 PDT 2007 Duncan Coutts <du...@ha...> > * Bump version number to 0.9.11.2 > in preparation for 0.9.12 release > > hunk ./configure.ac 25 > -AC_INIT([gtk2hs],[0.9.11.1]) > +AC_INIT([gtk2hs],[0.9.11.2]) |
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:28:25
|
Thu Jun 28 10:25:28 PDT 2007 Duncan Coutts <du...@ha...> tagged 0.9.11.2 |
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:25:29
|
Thu Jun 28 10:23:23 PDT 2007 Duncan Coutts <du...@ha...> * Bump version number to something bigger than 0.9.12 This is now the main/head branch which will lead to release version 0.9.13 The branch that will lead to the 0.9.12 release is at: http://darcs.haskell.org/gtk2hs-branches/gtk2hs-0.9.12/ hunk ./configure.ac 25 -AC_INIT([gtk2hs],[0.9.11.1]) +AC_INIT([gtk2hs],[0.9.12.2]) |
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:24:55
|
Thu Jun 28 10:15:53 PDT 2007 Duncan Coutts <du...@ha...>
* Add several soe demos
adddir ./demo/soe
hunk ./Makefile.am 1737
- demo/graphic demo/unicode
+ demo/graphic demo/unicode demo/soe
hunk ./Makefile.am 1742
-DEMOS += demo/glade demo/calc
+DEMOS += demo/glade demo/calc demo/noughty
hunk ./Makefile.am 1819
- demo/svg/Makefile demo/svg/Svg2Png.hs demo/svg/SvgViewer.hs
+ demo/svg/Makefile demo/svg/Svg2Png.hs demo/svg/SvgViewer.hs \
+ demo/soe/BouncingBall.hs demo/soe/Demo1.hs demo/soe/Demo2.hs \
+ demo/soe/Snowflake.hs demo/soe/Makefile
+
addfile ./demo/soe/BouncingBall.hs
hunk ./demo/soe/BouncingBall.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $
+ do w <- openWindowEx "Bouncing Ball" (Just (800,800)) (Just (200, 600)) drawBufferedGraphic (Just 30)
+ let loop x y xd yd
+ = do setGraphic w $ withColor Yellow $
+ ellipse (x-5,y-5) (x+5,y+5)
+ (xmax, ymax) <- getWindowSize w
+ let x' = x + xd + 5
+ y' = y + yd + 5
+ xd' | x' >= xmax || x' < 0 = -xd
+ | otherwise = xd
+ yd' | y' >= ymax || y' < 0 = -yd
+ | otherwise = yd
+ x'' = x + xd'
+ y'' = y + yd'
+ x''' | x'' + 5 > xmax = xmax `div` 2
+ | otherwise = x''
+ y''' | y'' + 5 > ymax = ymax `div` 2
+ | otherwise = y''
+ e <- maybeGetWindowEvent w
+ case e of Just Closed -> return ()
+ _ -> do getWindowTick w
+ loop x''' y''' xd' yd'
+ loop 300 100 5 5
+
addfile ./demo/soe/Demo1.hs
hunk ./demo/soe/Demo1.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $ do w <- openWindow "Testing" (200, 200)
+ drawInWindow w $ text (100,100) "Hello"
+ drawInWindow w $ line (50, 50) (75, 75)
+ drawInWindow w $ withColor White $ polyline [(10,10), (10,40), (20,20)]
+ drawInWindow w $ polygon [(60,60), (60,90), (80,90)]
+ drawInWindow w $ withColor Yellow $
+ ellipse (290, 190) (150, 150)
+ drawInWindow w $ arc (20,190) (90,130) (45) (390)
+ drawInWindow w $ withColor Blue $ line (20,190) (90,130)
+ drawInWindow w $ withColor Yellow $
+ shearEllipse (140, 10) (160, 90) (190, 50)
+ loopEvents w
+ closeWindow w
+
+loopEvents w = loop
+ where loop = do e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop
addfile ./demo/soe/Demo2.hs
hunk ./demo/soe/Demo2.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $ do w <- openWindow "Testing" (200, 200)
+ drawInWindow w $ text (10,180) "Hello"
+ drawInWindow w $ withColor Blue $
+ polyline [(20,20), (20,150), (150,150), (150,20), (20,20)]
+ let region = createRectangle (20,20) (100,100)
+ `orRegion` createRectangle (50,50) (150,150)
+ `diffRegion` createRectangle (100,100) (150,150)
+ drawInWindow w $ withColor Blue $
+ polyline [(20,20), (20,100), (100,100), (100,20), (20,20)]
+ drawInWindow w $ withColor Blue $
+ polyline [(50,50), (50,150), (150,150), (150,50), (50,50)]
+ drawInWindow w $ withColor Green $ drawRegion region
+ loopEvents w
+ closeWindow w
+
+loopEvents w = loop
+ where loop = do e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop
addfile ./demo/soe/Makefile
hunk ./demo/soe/Makefile 1
+
+PROGS = bouncingball snowflake demo1 demo2
+
+SOURCES = BouncingBall.hs Demo1.hs Demo2.hs Snowflake.hs
+PACKAGES = gtk soegtk
+
+all : $(PROGS)
+
+bouncingball : BouncingBall.hs
+ $(HC_RULE)
+
+snowflake : Snowflake.hs
+ $(HC_RULE)
+
+demo1 : Demo1.hs
+ $(HC_RULE)
+
+demo2 : Demo2.hs
+ $(HC_RULE)
+
+HC_RULE = $(HC) --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
+
+clean:
+ rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROGS)
+
+HC=ghc
addfile ./demo/soe/Snowflake.hs
hunk ./demo/soe/Snowflake.hs 1
+module Main where
+
+import Graphics.SOE.Gtk
+
+type Vector = (Double, Double)
+
+(<+>) :: Vector -> Vector -> Vector
+(a, b) <+> (c, d) = (a+c, b+d)
+
+(<->) :: Vector -> Vector -> Vector
+(a, b) <-> (c, d) = (a-c, b-d)
+
+(.*) :: Double -> Vector -> Vector
+k .* (a, b) = (k * a, k * b)
+
+(*.) :: Vector -> Double -> Vector
+(*.) = flip (.*)
+
+(<*>) :: Vector -> Vector -> Double
+(a, b) <*> (c, d) = a * c + b * d
+
+norm :: Vector -> Double
+norm v = sqrt (v <*> v)
+
+dist :: Vector -> Vector -> Double
+dist v1 v2 = norm (v1 <-> v2)
+
+xunit :: Vector
+xunit = (1, 0)
+
+yunit :: Vector
+yunit = (0,1)
+
+ortho :: Vector -> Vector
+ortho v@(a, b) = (m11*a + m12*b, m21*a+m22*b)
+ where m11 = cos ang
+ m12 = sin ang
+ m21 = -sin ang
+ m22 = cos ang
+ ang = pi/2
+
+
+type Line = (Vector, Vector)
+
+gen :: [Line] -> [Line]
+gen [] = []
+gen (l@(v1,v2):ls)
+ | dist v1 v2 < 3 = l : gen ls
+ | otherwise = let dir = v1 <-> v2
+ ort = ortho dir
+ p = v2 <+> ((1/3) .* dir)
+ q = v2 <+> ((2/3) .* dir)
+ r = v2 <+> (0.5 .* dir) <+> ((1/3) .* ort)
+ s = v2 <+> (0.5 .* dir) <+> ((-1/3) .* ort)
+ in --(v2,p) : (q,v1) : gen ((p,r) : (q,r) : (p,s) : (q,s) : ls)
+ gen ((v2,p) : (q,v1) : (p,r) : (q,r) : (p,s) : (q,s) : ls)
+ -- kauniimpi kuva (mutta teht[_\c3_][_\a4_]v[_\c3_][_\a4_]nannon vastainen) tulee
+ -- korvaamalla edellinen lauseke seuraavalla:
+ -- gen ((v2,p) : (q,v1) : (p,r) : (q,r) : (p,s) : (q,s) : ls)
+
+draw :: [Line] -> Graphic
+draw [] = emptyGraphic
+draw ((p1,p2):ls) = overGraphic (line (f p1) (f p2)) (draw ls)
+ where f (x,y) = (round (x), round (y))
+
+test = runGraphics $ do w <- openWindow "T 3.7-8" (200, 200)
+ loop w
+ closeWindow w
+ where loop w = do (xmax', ymax') <- getWindowSize w
+ let xmax = fromIntegral xmax'
+ ymax = fromIntegral ymax'
+ ls = gen [((1/8 * xmax, 1/2 * ymax),
+ (7/8 * xmax, 1/2 * ymax))]
+ setGraphic w (draw ls)
+ e <- getWindowEvent w
+ case e of Resize -> loop w
+ _ -> return ()
+
+main = test
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:24:52
|
Thu Jun 28 10:22:07 PDT 2007 Duncan Coutts <du...@ha...>
* Bump version number to 0.9.11.2
in preparation for 0.9.12 release
hunk ./configure.ac 25
-AC_INIT([gtk2hs],[0.9.11.1])
+AC_INIT([gtk2hs],[0.9.11.2])
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:24:52
|
Thu Jun 28 09:41:22 PDT 2007 Duncan Coutts <du...@ha...>
* Make soegtk work with the threaded RTS
So it should work in GHCi
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 108
- Gtk.initGUI
+ Gtk.unsafeInitGUIForThreadedRTS
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 144
-openWindowEx title position size (RedrawMode useDoubleBuffer) timer = do
+openWindowEx title position size (RedrawMode useDoubleBuffer) timer =
+ Gtk.postGUISync $ do
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 260
-getWindowSize win = Gtk.widgetGetSize (canvas win)
+getWindowSize win = Gtk.postGUISync $ Gtk.widgetGetSize (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 268
- Gtk.widgetQueueDraw (canvas win)
+ Gtk.postGUIAsync $ Gtk.widgetQueueDraw (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 276
- Gtk.widgetQueueDraw (canvas win)
+ Gtk.postGUIAsync $ Gtk.widgetQueueDraw (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 279
-closeWindow win = Gtk.widgetHide (window win)
+closeWindow win = Gtk.postGUIAsync $ Gtk.widgetHide (window win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 696
- MouseMove _ -> Gtk.widgetGetDrawWindow (canvas win)
+ MouseMove _ -> Gtk.postGUIAsync $
+ Gtk.widgetGetDrawWindow (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 709
- MouseMove _ -> Gtk.widgetGetDrawWindow (canvas win)
+ MouseMove _ -> Gtk.postGUIAsync $
+ Gtk.widgetGetDrawWindow (canvas win)
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:24:52
|
Thu Jun 28 09:49:47 PDT 2007 Duncan Coutts <du...@ha...>
* Comment out debugging output in soegtk
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 434
- Cairo.liftIO $ print ("createRectangle",x,y,width,height)
+-- Cairo.liftIO $ print ("createRectangle",x,y,width,height)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 494
- Cairo.liftIO $ print ("combineRegion",x,y,width,height)
+-- Cairo.liftIO $ print ("combineRegion",x,y,width,height)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 504
- Cairo.liftIO $ print ("mask surface",x,y)
+-- Cairo.liftIO $ print ("mask surface",x,y)
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:18:21
|
Thu Jun 28 10:15:53 PDT 2007 Duncan Coutts <du...@ha...>
* Add several soe demos
adddir ./demo/soe
hunk ./Makefile.am 1737
- demo/graphic demo/unicode
+ demo/graphic demo/unicode demo/soe
hunk ./Makefile.am 1742
-DEMOS += demo/glade demo/calc
+DEMOS += demo/glade demo/calc demo/noughty
hunk ./Makefile.am 1819
- demo/svg/Makefile demo/svg/Svg2Png.hs demo/svg/SvgViewer.hs
+ demo/svg/Makefile demo/svg/Svg2Png.hs demo/svg/SvgViewer.hs \
+ demo/soe/BouncingBall.hs demo/soe/Demo1.hs demo/soe/Demo2.hs \
+ demo/soe/Snowflake.hs demo/soe/Makefile
+
addfile ./demo/soe/BouncingBall.hs
hunk ./demo/soe/BouncingBall.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $
+ do w <- openWindowEx "Bouncing Ball" (Just (800,800)) (Just (200, 600)) drawBufferedGraphic (Just 30)
+ let loop x y xd yd
+ = do setGraphic w $ withColor Yellow $
+ ellipse (x-5,y-5) (x+5,y+5)
+ (xmax, ymax) <- getWindowSize w
+ let x' = x + xd + 5
+ y' = y + yd + 5
+ xd' | x' >= xmax || x' < 0 = -xd
+ | otherwise = xd
+ yd' | y' >= ymax || y' < 0 = -yd
+ | otherwise = yd
+ x'' = x + xd'
+ y'' = y + yd'
+ x''' | x'' + 5 > xmax = xmax `div` 2
+ | otherwise = x''
+ y''' | y'' + 5 > ymax = ymax `div` 2
+ | otherwise = y''
+ e <- maybeGetWindowEvent w
+ case e of Just Closed -> return ()
+ _ -> do getWindowTick w
+ loop x''' y''' xd' yd'
+ loop 300 100 5 5
+
addfile ./demo/soe/Demo1.hs
hunk ./demo/soe/Demo1.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $ do w <- openWindow "Testing" (200, 200)
+ drawInWindow w $ text (100,100) "Hello"
+ drawInWindow w $ line (50, 50) (75, 75)
+ drawInWindow w $ withColor White $ polyline [(10,10), (10,40), (20,20)]
+ drawInWindow w $ polygon [(60,60), (60,90), (80,90)]
+ drawInWindow w $ withColor Yellow $
+ ellipse (290, 190) (150, 150)
+ drawInWindow w $ arc (20,190) (90,130) (45) (390)
+ drawInWindow w $ withColor Blue $ line (20,190) (90,130)
+ drawInWindow w $ withColor Yellow $
+ shearEllipse (140, 10) (160, 90) (190, 50)
+ loopEvents w
+ closeWindow w
+
+loopEvents w = loop
+ where loop = do e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop
addfile ./demo/soe/Demo2.hs
hunk ./demo/soe/Demo2.hs 1
+{- Written by Antti-Juhani Kaijanaho.
+ You may treat this file as if it were in the public domain.
+-}
+module Main where
+
+import Graphics.SOE.Gtk
+
+main = runGraphics $ do w <- openWindow "Testing" (200, 200)
+ drawInWindow w $ text (10,180) "Hello"
+ drawInWindow w $ withColor Blue $
+ polyline [(20,20), (20,150), (150,150), (150,20), (20,20)]
+ let region = createRectangle (20,20) (100,100)
+ `orRegion` createRectangle (50,50) (150,150)
+ `diffRegion` createRectangle (100,100) (150,150)
+ drawInWindow w $ withColor Blue $
+ polyline [(20,20), (20,100), (100,100), (100,20), (20,20)]
+ drawInWindow w $ withColor Blue $
+ polyline [(50,50), (50,150), (150,150), (150,50), (50,50)]
+ drawInWindow w $ withColor Green $ drawRegion region
+ loopEvents w
+ closeWindow w
+
+loopEvents w = loop
+ where loop = do e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop
addfile ./demo/soe/Makefile
hunk ./demo/soe/Makefile 1
+
+PROGS = bouncingball snowflake demo1 demo2
+
+SOURCES = BouncingBall.hs Demo1.hs Demo2.hs Snowflake.hs
+PACKAGES = gtk soegtk
+
+all : $(PROGS)
+
+bouncingball : BouncingBall.hs
+ $(HC_RULE)
+
+snowflake : Snowflake.hs
+ $(HC_RULE)
+
+demo1 : Demo1.hs
+ $(HC_RULE)
+
+demo2 : Demo2.hs
+ $(HC_RULE)
+
+HC_RULE = $(HC) --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
+
+clean:
+ rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROGS)
+
+HC=ghc
addfile ./demo/soe/Snowflake.hs
hunk ./demo/soe/Snowflake.hs 1
+module Main where
+
+import Graphics.SOE.Gtk
+
+type Vector = (Double, Double)
+
+(<+>) :: Vector -> Vector -> Vector
+(a, b) <+> (c, d) = (a+c, b+d)
+
+(<->) :: Vector -> Vector -> Vector
+(a, b) <-> (c, d) = (a-c, b-d)
+
+(.*) :: Double -> Vector -> Vector
+k .* (a, b) = (k * a, k * b)
+
+(*.) :: Vector -> Double -> Vector
+(*.) = flip (.*)
+
+(<*>) :: Vector -> Vector -> Double
+(a, b) <*> (c, d) = a * c + b * d
+
+norm :: Vector -> Double
+norm v = sqrt (v <*> v)
+
+dist :: Vector -> Vector -> Double
+dist v1 v2 = norm (v1 <-> v2)
+
+xunit :: Vector
+xunit = (1, 0)
+
+yunit :: Vector
+yunit = (0,1)
+
+ortho :: Vector -> Vector
+ortho v@(a, b) = (m11*a + m12*b, m21*a+m22*b)
+ where m11 = cos ang
+ m12 = sin ang
+ m21 = -sin ang
+ m22 = cos ang
+ ang = pi/2
+
+
+type Line = (Vector, Vector)
+
+gen :: [Line] -> [Line]
+gen [] = []
+gen (l@(v1,v2):ls)
+ | dist v1 v2 < 3 = l : gen ls
+ | otherwise = let dir = v1 <-> v2
+ ort = ortho dir
+ p = v2 <+> ((1/3) .* dir)
+ q = v2 <+> ((2/3) .* dir)
+ r = v2 <+> (0.5 .* dir) <+> ((1/3) .* ort)
+ s = v2 <+> (0.5 .* dir) <+> ((-1/3) .* ort)
+ in --(v2,p) : (q,v1) : gen ((p,r) : (q,r) : (p,s) : (q,s) : ls)
+ gen ((v2,p) : (q,v1) : (p,r) : (q,r) : (p,s) : (q,s) : ls)
+ -- kauniimpi kuva (mutta teht[_\c3_][_\a4_]v[_\c3_][_\a4_]nannon vastainen) tulee
+ -- korvaamalla edellinen lauseke seuraavalla:
+ -- gen ((v2,p) : (q,v1) : (p,r) : (q,r) : (p,s) : (q,s) : ls)
+
+draw :: [Line] -> Graphic
+draw [] = emptyGraphic
+draw ((p1,p2):ls) = overGraphic (line (f p1) (f p2)) (draw ls)
+ where f (x,y) = (round (x), round (y))
+
+test = runGraphics $ do w <- openWindow "T 3.7-8" (200, 200)
+ loop w
+ closeWindow w
+ where loop w = do (xmax', ymax') <- getWindowSize w
+ let xmax = fromIntegral xmax'
+ ymax = fromIntegral ymax'
+ ls = gen [((1/8 * xmax, 1/2 * ymax),
+ (7/8 * xmax, 1/2 * ymax))]
+ setGraphic w (draw ls)
+ e <- getWindowEvent w
+ case e of Resize -> loop w
+ _ -> return ()
+
+main = test
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 17:18:20
|
Thu Jun 28 09:49:47 PDT 2007 Duncan Coutts <du...@ha...>
* Comment out debugging output in soegtk
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 434
- Cairo.liftIO $ print ("createRectangle",x,y,width,height)
+-- Cairo.liftIO $ print ("createRectangle",x,y,width,height)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 494
- Cairo.liftIO $ print ("combineRegion",x,y,width,height)
+-- Cairo.liftIO $ print ("combineRegion",x,y,width,height)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 504
- Cairo.liftIO $ print ("mask surface",x,y)
+-- Cairo.liftIO $ print ("mask surface",x,y)
|
|
From: Duncan C. <dun...@wo...> - 2007-06-28 16:42:38
|
Thu Jun 28 09:41:22 PDT 2007 Duncan Coutts <du...@ha...>
* Make soegtk work with the threaded RTS
So it should work in GHCi
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 108
- Gtk.initGUI
+ Gtk.unsafeInitGUIForThreadedRTS
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 144
-openWindowEx title position size (RedrawMode useDoubleBuffer) timer = do
+openWindowEx title position size (RedrawMode useDoubleBuffer) timer =
+ Gtk.postGUISync $ do
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 260
-getWindowSize win = Gtk.widgetGetSize (canvas win)
+getWindowSize win = Gtk.postGUISync $ Gtk.widgetGetSize (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 268
- Gtk.widgetQueueDraw (canvas win)
+ Gtk.postGUIAsync $ Gtk.widgetQueueDraw (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 276
- Gtk.widgetQueueDraw (canvas win)
+ Gtk.postGUIAsync $ Gtk.widgetQueueDraw (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 279
-closeWindow win = Gtk.widgetHide (window win)
+closeWindow win = Gtk.postGUIAsync $ Gtk.widgetHide (window win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 696
- MouseMove _ -> Gtk.widgetGetDrawWindow (canvas win)
+ MouseMove _ -> Gtk.postGUIAsync $
+ Gtk.widgetGetDrawWindow (canvas win)
hunk ./soegtk/Graphics/SOE/Gtk.hs.pp 709
- MouseMove _ -> Gtk.widgetGetDrawWindow (canvas win)
+ MouseMove _ -> Gtk.postGUIAsync $
+ Gtk.widgetGetDrawWindow (canvas win)
|
|
From: Duncan C. <dun...@wo...> - 2007-05-31 13:09:25
|
Thu May 31 04:05:45 PDT 2007 Duncan Coutts <du...@ha...>
* Fix all package files to use a dep on base and not haskell98
hunk ./cairo/cairo.cabal.in 11
-build-depends: haskell98 mtl glib==@PACKAGE_VERSION@
+build-depends: base mtl glib==@PACKAGE_VERSION@
hunk ./cairo/cairo.package.conf.in 18
-depends: haskell98 mtl glib-@PACKAGE_VERSION@
+depends: base mtl glib-@PACKAGE_VERSION@
hunk ./cairo/cairo.pkg.in 11
- package_deps = ["haskell98", "glib"],
+ package_deps = ["base", "glib"],
hunk ./gconf/gconf.cabal.in 9
-build-depends: glib==@PACKAGE_VERSION@
+build-depends: base glib==@PACKAGE_VERSION@
hunk ./gconf/gconf.package.conf.in 16
-depends: glib-@PACKAGE_VERSION@
+depends: base glib-@PACKAGE_VERSION@
hunk ./gconf/gconf.pkg.in 11
- package_deps = ["glib"],
+ package_deps = ["base", "glib"],
hunk ./glade/glade.cabal.in 9
-build-depends: gtk==@PACKAGE_VERSION@
+build-depends: base gtk==@PACKAGE_VERSION@
hunk ./glade/glade.package.conf.in 16
-depends: gtk-@PACKAGE_VERSION@
+depends: base gtk-@PACKAGE_VERSION@
hunk ./glade/glade.pkg.in 11
- package_deps = ["gtk"],
+ package_deps = ["base", "gtk"],
hunk ./glib/glib.cabal.in 9
-build-depends: haskell98
+build-depends: base
hunk ./glib/glib.package.conf.in 16
-depends: haskell98
+depends: base
hunk ./glib/glib.pkg.in 11
- package_deps = ["haskell98"],
+ package_deps = ["base"],
hunk ./gtk/gtk.cabal.in 9
-build-depends: glib==@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+build-depends: base glib==@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
hunk ./gtk/gtk.package.conf.in 16
-depends: mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
hunk ./gtk/gtk.pkg.in 11
- package_deps = ["glib" @GTK_CAIRO_DEPEND_NO_CABAL@],
+ package_deps = ["base", "glib" @GTK_CAIRO_DEPEND_NO_CABAL@],
hunk ./gtkglext/gtkglext.cabal.in 9
-build-depends: gtk==@PACKAGE_VERSION@
+build-depends: base gtk==@PACKAGE_VERSION@
hunk ./gtkglext/gtkglext.package.conf.in 16
-depends: gtk-@PACKAGE_VERSION@
+depends: base gtk-@PACKAGE_VERSION@
hunk ./gtkglext/gtkglext.pkg.in 11
- package_deps = ["gtk"],
+ package_deps = ["base", "gtk"],
hunk ./mozembed/mozembed.cabal.in 9
-build-depends: gtk==@PACKAGE_VERSION@
+build-depends: base gtk==@PACKAGE_VERSION@
hunk ./mozembed/mozembed.package.conf.in 16
-depends: gtk-@PACKAGE_VERSION@
+depends: base gtk-@PACKAGE_VERSION@
hunk ./mozembed/mozembed.pkg.in 11
- package_deps = ["gtk"],
+ package_deps = ["base", "gtk"],
hunk ./soegtk/soegtk.cabal.in 9
-build-depends: gtk==@PACKAGE_VERSION@, cairo==@PACKAGE_VERSION@
+build-depends: base gtk==@PACKAGE_VERSION@, cairo==@PACKAGE_VERSION@
hunk ./soegtk/soegtk.package.conf.in 13
-depends: gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
hunk ./soegtk/soegtk.pkg.in 11
- package_deps = ["gtk" @GTK_CAIRO_DEPEND_NO_CABAL@],
+ package_deps = ["base", "gtk" @GTK_CAIRO_DEPEND_NO_CABAL@],
hunk ./sourceview/sourceview.cabal.in 9
-build-depends: gtk==@PACKAGE_VERSION@
+build-depends: base gtk==@PACKAGE_VERSION@
hunk ./sourceview/sourceview.package.conf.in 19
-depends: gtk-@PACKAGE_VERSION@
+depends: base gtk-@PACKAGE_VERSION@
hunk ./sourceview/sourceview.pkg.in 14
- package_deps = ["gtk"],
+ package_deps = ["base", "gtk"],
hunk ./svgcairo/svgcairo.cabal.in 11
-build-depends: haskell98 mtl glib==@PACKAGE_VERSION@ cairo==@PACKAGE_VERSION@
+build-depends: base mtl glib==@PACKAGE_VERSION@ cairo==@PACKAGE_VERSION@
hunk ./svgcairo/svgcairo.package.conf.in 18
-depends: haskell98 mtl glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
+depends: base mtl glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
hunk ./svgcairo/svgcairo.pkg.in 11
- package_deps = ["haskell98", "glib", "cairo"],
+ package_deps = ["base", "glib", "cairo"],
|
|
From: Duncan C. <dun...@wo...> - 2007-05-31 13:09:22
|
Thu May 31 03:52:51 PDT 2007 Duncan Coutts <du...@ha...>
* The gtk package now always depends on mtl
At least with ghc-6.4 and later, not that the .package.conf files are
only used for ghc-6.4 and the other form is used for ghc-6.2 and before
so we just add it to one file and not the other, rather than needing
to add more conditional stuff to configure.ac
hunk ./gtk/gtk.package.conf.in 16
-depends: glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
|
|
From: Duncan C. <dun...@wo...> - 2007-05-31 13:09:22
|
Thu May 31 03:44:25 PDT 2007 Duncan Coutts <du...@ha...>
* The ps/pdf_surface_set_size functions appeared in cairo 1.2
I had thought they were there before but I was confusing them with
ps/pdf_surface_set_dpi which only appeared in cairo 1.0 but were removed
before the ps & pdf backends were declared stable in cairo 1.2.
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/PDF.chs.pp 26
+
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/PDF.chs.pp 29
+#endif
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/PS.chs.pp 26
+
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/PS.chs.pp 29
+#endif
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 182
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 185
+#endif
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 190
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 193
+#endif
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1563
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1576
+#endif
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1626
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1639
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-05-31 13:09:21
|
Thu May 31 03:51:26 PDT 2007 Duncan Coutts <du...@ha...>
* Change sed script to work with solaris sed
The problem was with the optional "qualified" clause, but it turns out
we don't need that anyway which allows it to work with the default
solaris sed.
hunk ./mk/chsDepend.in 28
- | $SED 'y/./\//;s/^{#import \(qualified \)*\([a-zA-Z1-9/]*\)#}.*/\2/'`;
+ | $SED 'y|.|/|;s|^{#import \([a-zA-Z1-9/]*\)#}.*|\1|'`;
|
2 messages has been excluded from this view by a project administrator.
