gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/mk config.mk.in,1.21,1.22

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv20828/mk

Modified Files:
	config.mk.in 
Log Message:
Added libglade bindings, including configury and demo program
it will build a package called "glade"


Index: config.mk.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config.mk.in	16 Nov 2003 12:16:29 -0000	1.21
+++ config.mk.in	11 Dec 2003 22:48:23 -0000	1.22
@@ -89,6 +89,9 @@
 # Provide a SourceView widget.
 ENABLE_SOURCEVIEW = @ENABLE_SOURCEVIEW@
 
+# Provide libglade bindings.
+ENABLE_LIBGLADE = @ENABLE_LIBGLADE@
+
 # This should be libXXX.a and XXX for Unix and
 #		    XXX.lib and XXX.exe for Windows
 
@@ -145,6 +148,9 @@
 
 SOURCEVIEW_LIBS	= @SOURCEVIEW_LIBS@
 SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
+
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
 
 .PHONY: default all install installdirs installfiles installpackage \
 	installcheck uninstall uninstallfiles uninstallpackage \

[Gtk2hs-commit] gtk2hs ChangeLog,1.120,1.121 configure.in,1.33,1.34 Makefile,1.23,1.24

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv20828

Modified Files:
	ChangeLog configure.in Makefile 
Log Message:
Added libglade bindings, including configury and demo program
it will build a package called "glade"


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- ChangeLog	11 Dec 2003 16:15:56 -0000	1.120
+++ ChangeLog	11 Dec 2003 22:48:23 -0000	1.121
@@ -6,6 +6,24 @@
 	functions with a class constraint. This saves carrying around
 	so many class dictionaries per object - now only one.
 
+	* configure.in: added libglade detection
+
+	* Makefile: added glade and demo/glade targets
+
+	* mk/config.mk.in: added LIBGLADE_* variables
+
+	* tools/hierarchyGen/hierarchy.list: added GladeXML class
+
+	* glade/Glade.chs: new libglade binding module
+
+	* glade/Makefile: new file
+
+	* demo/glade/Makefile: new file
+
+	* demo/glade/GladeTest.hs: simple demo of Glade functionality
+
+	* demo/glade/simple.glade: glade file used by the demo program
+
 2003-11-26 Duncan Coutts <du...@co...>
 
 	* tools/hierarchyGen/TypeGen.hs: added extra commandline parameters

Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- configure.in	17 Nov 2003 17:47:04 -0000	1.33
+++ configure.in	11 Dec 2003 22:48:23 -0000	1.34
@@ -251,6 +251,23 @@
 
 AC_MSG_RESULT($ENABLE_SOURCEVIEW)
 
+
+dnl Check if user wants the libglade extension. Make the default value for this
+dnl flag dependant on whether it is installed or not.
+ENABLE_LIBGLADE=yes;
+AC_MSG_CHECKING([if libglade bindings can be built])
+
+AC_ARG_ENABLE(libglade,
+              [  --enable-libglade       generate binding for libglade],
+              [FOUNDLIBGLADE=$enableval],[FOUNDLIBGLADE=yes])
+
+dnl Reset the flag if libglade is not installed
+$PKG_CONFIG --exists libglade-2.0 || FOUNDLIBGLADE=no;
+if test x$FOUNDLIBGLADE = xno; then ENABLE_LIBGLADE=no;fi;
+
+AC_MSG_RESULT($ENABLE_LIBGLADE)
+
+
 dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES
 dnl macro from the pkg-config program.
 PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0])
@@ -260,6 +277,9 @@
 if test x$ENABLE_SOURCEVIEW = xyes; then
   PKG_CHECK_MODULES(SOURCEVIEW,[gtksourceview-1.0 >= 0.6.0])
 fi
+if test x$ENABLE_LIBGLADE = xyes; then
+  PKG_CHECK_MODULES(LIBGLADE,[libglade-2.0 >= 2.0.0])
+fi
 
 dnl The configuration program for GTK is kind of stupid in that it
 dnl lists directories which don't exist. ghc-pkg in ghc 5.04 or greater
@@ -302,6 +322,25 @@
   esac;
 done;
 
+TMPLIBGLADE_CFLAGS=$LIBGLADE_CFLAGS;
+LIBGLADE_CFLAGS=;
+for FLAG in $TMPLIBGLADE_CFLAGS; do
+  case $FLAG in
+    -I*) DIR=`echo $FLAG | $SED "s/-I//"`;
+	 if test -d $DIR; then LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS -I$DIR"; fi;;
+    *) LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS $FLAG";;
+  esac;
+done;
+TMPLIBGLADE_LIBS=$LIBGLADE_LIBS;
+LIBGLADE_LIBS=;
+for FLAG in $TMPLIBGLADE_LIBS; do
+  case $FLAG in
+    -L*) DIR=`echo $FLAG | $SED "s/-L//"`;
+	 if test -d $DIR; then LIBGLADE_LIBS="$LIBGLADE_LIBS -L$DIR"; fi;;
+    *) LIBGLADE_LIBS="$LIBGLADE_LIBS $FLAG";;
+  esac;
+done;
+
 dnl Have a special marshall list (available in the source tree of Gtk+ under
 dnl gtk/gtkmarshal.list)
 
@@ -508,6 +547,9 @@
 AC_SUBST(ENABLE_SOURCEVIEW)
 AC_SUBST(SOURCEVIEW_CFLAGS)
 AC_SUBST(SOURCEVIEW_LIBS)
+AC_SUBST(ENABLE_LIBGLADE)
+AC_SUBST(LIBGLADE_CFLAGS)
+AC_SUBST(LIBGLADE_LIBS)
 dnl Documentation
 AC_SUBST(BUILDDOCS)
 AC_SUBST(XSLTTRANS)

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	15 Nov 2003 11:51:44 -0000	1.23
+++ Makefile	11 Dec 2003 22:48:23 -0000	1.24
@@ -22,6 +22,10 @@
 MAKE_LIBS += sourceview
 endif
 
+ifeq ($(strip $(ENABLE_LIBGLADE)),yes)
+MAKE_LIBS += glade
+endif
+
 MAKE_LIBS += mogul
 
 MAKE_APPS  = demo/concurrent demo/treeList demo/graphic demo/unicode \
@@ -31,6 +35,9 @@
 MAKE_APPS += demo/sourceview
 endif
 
+ifeq ($(strip $(ENABLE_LIBGLADE)),yes)
+MAKE_APPS += demo/glade
+endif
 
 EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \
 			 TODO VERSION aclocal.m4 acinclude.m4 \

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen hierarchy.list,1.3,1.4

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv20828/tools/hierarchyGen

Modified Files:
	hierarchy.list 
Log Message:
Added libglade bindings, including configury and demo program
it will build a package called "glade"


Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hierarchy.list	19 Nov 2003 19:32:21 -0000	1.3
+++ hierarchy.list	11 Dec 2003 22:48:23 -0000	1.4
@@ -153,6 +153,7 @@
         GtkSourceLanguagesManager	if sourceview
 #this one is actualy an interface, but all interface implementations must be GObjects
 	GtkSourceStyleScheme		if sourceview
+	GladeXML			as GladeXML, glade_xml_get_type if libglade
 # This now became a GObject in version 2:
 	GdkGC				as GC, gdk_gc_get_type
 # These are Pango structures

[Gtk2hs-commit] gtk2hs/demo/glade - New directory

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/glade
In directory sc8-pr-cvs1:/tmp/cvs-serv19522/demo/glade

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/demo/glade added to the repository

[Gtk2hs-commit] gtk2hs/glade - New directory

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/glade
In directory sc8-pr-cvs1:/tmp/cvs-serv19383/glade

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/glade added to the repository

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen TypeGen.hs,1.3,1.4

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv776/tools/hierarchyGen

Modified Files:
	TypeGen.hs 
Log Message:
changed the way the object hierarchy is implemented.
All classes except GObject now have no member functions.
The from* to* functions are now ordinary functions with a class constraint.


Index: TypeGen.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/TypeGen.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TypeGen.hs	26 Nov 2003 18:21:34 -0000	1.3
+++ TypeGen.hs	11 Dec 2003 16:15:57 -0000	1.4
@@ -167,7 +167,9 @@
   indent 0.ss "module ".ss fname.sc '('.
 --  indent 1.ss "ObjectTag(..)".
   foldl (\s1 s2 -> s1.ss ", ".s2) id (map (\(n:_) -> 
-		indent 1.ss n.ss "(".ss n.ss "), ".ss n.ss "Class(..),".
+		indent 1.ss n.ss "(".ss n.ss "), ".ss n.ss "Class,".
+		indent 1.ss "to".ss n.ss ", ".
+		indent 1.ss "from".ss n.ss ", ".
 		indent 1.ss "mk".ss n.ss ", un".ss n.sc ','.
 		indent 1.ss "castTo".ss n) objs).
   indent 1.ss ") where".
@@ -245,26 +247,34 @@
   indent 0.ss "mk".ss name.ss " = ".ss name.
   indent 0.ss "un".ss name.ss " (".ss name.ss " o) = o".
   indent 0.
-  indent 0.ss "class ".
-    (if not (null parents) then ss (head parents).ss "Class o => " else id).
-	   ss name.ss "Class o where".
-  indent 1.ss "to".ss name.ss "   :: o -> ".ss name.
-  indent 1.ss "from".ss name.ss " :: ".ss name.ss " -> o".
-  indent 0.
-  indent 0.ss "instance ".ss name.ss "Class ".ss name.ss " where".
-  indent 1.ss "to".ss name.ss "   = id".
-  indent 1.ss "from".ss name.ss " = id".
-  indent 0.
-  makeInstance name parents.
+  (if null parents
+  then
+    indent 0.ss "class ".ss name.ss "Class o where".
+    indent 1.ss "to".ss name.ss "   :: o -> ".ss name.
+    indent 1.ss "from".ss name.ss " :: ".ss name.ss " -> o".
+    indent 0.
+    indent 0.ss "instance ".ss name.ss "Class ".ss name.ss " where".
+    indent 1.ss "to".ss name.ss "   = id".
+    indent 1.ss "from".ss name.ss " = id"
+  else
+    indent 0.ss "class ".ss (head parents).ss "Class o => ".ss name.ss "Class o".
+    indent 0.ss "to".ss name.ss "   :: ".ss name.ss "Class o => o -> ".ss name.
+    indent 0.ss "to".ss name.ss "   = from".ss (last parents).ss " . to".ss (last parents).
+    indent 0.ss "from".ss name.ss " :: ".ss name.ss "Class o => ".ss name.ss " -> o".
+    indent 0.ss "from".ss name.ss " = from".ss (last parents).ss " . to".ss (last parents).
+    indent 0.
+    makeInstance name (name:parents)).
   indent 0
 
 makeInstance :: String -> [String] -> ShowS
-makeInstance name []         = id
-makeInstance name (par:ents) =
+makeInstance name [par] =
+  indent 0.
   indent 0.ss "instance ".ss par.ss "Class ".ss name.ss " where".
   indent 1.ss "to".ss par.ss "   = mk".ss par.ss ".castForeignPtr.un".ss name.
   indent 1.ss "from".ss par.ss " = mk".ss name.ss ".castForeignPtr.un".ss par.
-  indent 0.
+  indent 0
+makeInstance name (par:ents) =
+  indent 0.ss "instance ".ss par.ss "Class ".ss name.
   makeInstance name ents
 
  

[Gtk2hs-commit] gtk2hs ChangeLog,1.119,1.120

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv776

Modified Files:
	ChangeLog 
Log Message:
changed the way the object hierarchy is implemented.
All classes except GObject now have no member functions.
The from* to* functions are now ordinary functions with a class constraint.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- ChangeLog	26 Nov 2003 18:21:33 -0000	1.119
+++ ChangeLog	11 Dec 2003 16:15:56 -0000	1.120
@@ -1,3 +1,11 @@
+2003-12-11 Duncan Coutts <du...@co...>
+
+	* tools/hierarchyGen/TypeGen.hs: changed the way the object
+	hierarchy is implemented. All classes except GObject now have
+	no member functions. The from* to* functions are now ordinary
+	functions with a class constraint. This saves carrying around
+	so many class dictionaries per object - now only one.
+
 2003-11-26 Duncan Coutts <du...@co...>
 
 	* tools/hierarchyGen/TypeGen.hs: added extra commandline parameters

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen TypeGen.hs,1.2,1.3

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv27846/tools/hierarchyGen

Modified Files:
	TypeGen.hs 
Log Message:
added --lib= and --prefix= parameters to the TypeGenerator program
this is needed by libglade bindings


Index: TypeGen.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/TypeGen.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TypeGen.hs	17 Nov 2003 15:48:29 -0000	1.2
+++ TypeGen.hs	26 Nov 2003 18:21:34 -0000	1.3
@@ -90,6 +90,12 @@
   when (length args<2) usage
   let (hierFile: goalFile: rem) = args
   let tags = map (drop 6) (filter ("--tag=" `isPrefixOf`)  rem)
+  let lib = case map (drop 6) (filter ("--lib=" `isPrefixOf`)  rem) of
+              [] -> "gtk"
+	      (lib:_) -> lib
+  let prefix = case map (drop 9) (filter ("--prefix=" `isPrefixOf`)  rem) of
+                 [] -> "gtk"
+                 (prefix:_) -> prefix
   content <- readFile hierFile
   let (objs, specialQueries) = unzip $
 				 pFreshLine (freshParserState tags) content
@@ -99,19 +105,24 @@
 		  dropWhile isAlpha .
 		  reverse		     
   writeFile goalFile $
-    generate (bareFName goalFile)
+    generate (bareFName goalFile) lib prefix
       (map (map snd) objs) (catMaybes specialQueries) ""
 
 
 usage = do
  putStr "\nProgram to generate Gtk's object hierarchy in Haskell. Usage:\n\
 	\TypeGenerator <hierFile> <outFile> {--tag=<tag>}\n\
+	\              {--lib=<lib>} {--prefix=<prefix>}\n\
 	\where\n\
 	\  <hierFile>	   a list of all possible objects, the hierarchy is\n\
 	\		   taken from the indentation\n\
 	\  <outFile>	   is the name and path of the output file\n\
 	\  <tag>           generate entries that have the tag <tag>\n\
-	\		   specify `default' for types without tags\n"
+	\		   specify `default' for types without tags\n\
+	\  <lib>           set the lib to use in the c2hs {#context #}\n\
+	\                  declaration (the default is \"gtk\")\n\
+	\  <prefix>        set the prefix to use in the c2hs {#context #}\n\
+	\                  declaration (the default is \"gtk\")\n"
  exitWith $ ExitFailure 1
 
 
@@ -120,8 +131,8 @@
 -- generate dynamic fragments
 -------------------------------------------------------------------------------
 
-generate :: String -> [[String]] -> [(String, (String, String))] -> ShowS
-generate fname objs typeTable = 
+generate :: String -> String -> String -> [[String]] -> [(String, (String, String))] -> ShowS
+generate fname lib prefix objs typeTable = 
   let fillCol str = ss $ replicate 
 		    (maximum (map (length.head) objs)-length str) ' ' 
   in
@@ -167,7 +178,7 @@
   -- these are not created in this file
   (if fname/="Hierarchy" then indent 0.ss "{#import Hierarchy#}" else id).
   indent 0.
-  indent 0.ss "{#context lib=\"gtk\" prefix=\"gtk\" #}".
+  indent 0.ss "{#context lib=\"".ss lib.ss "\" prefix=\"".ss prefix.ss "\" #}".
   indent 0.
   indent 0.ss "castToGObject = id".
   indent 0.

[Gtk2hs-commit] gtk2hs ChangeLog,1.118,1.119

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv27846

Modified Files:
	ChangeLog 
Log Message:
added --lib= and --prefix= parameters to the TypeGenerator program
this is needed by libglade bindings


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- ChangeLog	19 Nov 2003 19:43:10 -0000	1.118
+++ ChangeLog	26 Nov 2003 18:21:33 -0000	1.119
@@ -1,3 +1,9 @@
+2003-11-26 Duncan Coutts <du...@co...>
+
+	* tools/hierarchyGen/TypeGen.hs: added extra commandline parameters
+	--lib=<lib> --prefix=<prefix>, which set the c2hs context directive.
+	This is needed for libglade bindings.
+
 2003-11-19 Duncan Coutts <du...@co...>
 
 	* tools/hierarchyGen/hierarchy.list: added GtkSourceMarker and

[Gtk2hs-commit] gtk2hs ChangeLog,1.117,1.118

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv1883

Modified Files:
	ChangeLog 
Log Message:
several fixes & extra bindings for sourceview


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- ChangeLog	18 Nov 2003 22:57:05 -0000	1.117
+++ ChangeLog	19 Nov 2003 19:43:10 -0000	1.118
@@ -1,3 +1,25 @@
+2003-11-19 Duncan Coutts <du...@co...>
+
+	* tools/hierarchyGen/hierarchy.list: added GtkSourceMarker and
+	GtkSourceStyleScheme. The latter is actually an interface, but
+	everything implementing a glib-style interface must be a GObject.
+	
+	* sourceview/Makefile: added SourceStyleScheme-HEADER
+	
+	* sourceview/SourceMarker.chs: new module, requires recently
+	comitted changes to c2hs in order to build ok.
+	
+	* sourceview/sourceview.h: added missing #include for gtksourcemarker
+	
+	* sourceview/SourceStyleScheme.chs: removed unnecessary code, now
+	that GtkSourceStyleScheme has been added into the hierarchy.list
+	
+	* sourceview/SourceLanguage.chs: added bindings for more functions,
+	mostly related to SourceMarker
+	
+	* sourceview/SourceBuffer.chs: added remaining function bindings,
+	again mostly related to SourceMarker
+
 2003-11-18 Axel Simon <A....@ke...>
 
 	* demo/sourceview/Sourceview.hs: Give an error message if the

[Gtk2hs-commit] gtk2hs/sourceview SourceMarker.chs,NONE,1.1 Makefile,1.6,1.7 SourceBuffer.chs,1.2,1.3 SourceLanguage.chs,1.1,1.2 SourceStyleScheme.chs,1.1,1.2 sourceview.h,1.2,1.3

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv32629

Modified Files:
	Makefile SourceBuffer.chs SourceLanguage.chs 
	SourceStyleScheme.chs sourceview.h 
Added Files:
	SourceMarker.chs 
Log Message:
Added SourceMarker, many remaining bindings & made SourceStyleScheme work ok


--- NEW FILE: SourceMarker.chs ---
-- -*-haskell-*-
--  GIMP Toolkit (GTK) @entry SourceMarker@
--
--  Author : Duncan Coutts
--  derived from GtkTextView bindings by Axel Simon
--          
--  Created: 26 October 2003
--
--  This file is free software; you can redistribute it and/or modify
--  it under the terms of the GNU General Public License as published by
--  the Free Software Foundation; either version 2 of the License, or
--  (at your option) any later version.
--
--  This file is distributed in the hope that it will be useful,
--  but WITHOUT ANY WARRANTY; without even the implied warranty of
--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--  GNU General Public License for more details.
--
-- @description@ --------------------------------------------------------------
--
--
-- @documentation@ ------------------------------------------------------------
--
--
-- @todo@ ---------------------------------------------------------------------
--
--
module SourceMarker (
  SourceMarker,
  sourceMarkerSetMarkerType,
  sourceMarkerGetMarkerType,
  sourceMarkerGetLine,
  sourceMarkerGetName,
  sourceMarkerGetBuffer,
  sourceMarkerNext,
  sourceMarkerPrev
) where

import Monad	(liftM)
import FFI
import GObject	(makeNewGObject)
{#import Hierarchy#}
{#import SourceViewType#}

{# context lib="gtk" prefix="gtk" #}

-- methods

-- @method sourceMarkerSetMarkerType@
-- 
sourceMarkerSetMarkerType :: SourceMarker -> String -> IO ()
sourceMarkerSetMarkerType mark markType =
  withCString markType $ \strPtr1 ->
  {#call unsafe source_marker_set_marker_type#} mark strPtr1

-- @method sourceMarkerGetMarkerType@
-- 
sourceMarkerGetMarkerType :: SourceMarker -> IO String
sourceMarkerGetMarkerType mark = do
  strPtr <- {#call unsafe source_marker_get_marker_type#} mark
  markType <- peekUTFString strPtr
  {#call unsafe g_free#} (castPtr strPtr)
  return markType

-- @method sourceMarkerGetLine@
-- 
sourceMarkerGetLine :: SourceMarker -> IO Int
sourceMarkerGetLine mark = liftM fromIntegral $
  {#call unsafe source_marker_get_line#} mark

-- @method sourceMarkerGetName@
-- 
sourceMarkerGetName :: SourceMarker -> IO String
sourceMarkerGetName mark =
  {#call unsafe source_marker_get_name#} mark >>= peekUTFString

-- @method sourceMarkerGetBuffer@
-- 
sourceMarkerGetBuffer :: SourceMarker -> IO SourceBuffer
sourceMarkerGetBuffer mark = makeNewGObject mkSourceBuffer $
  {#call unsafe source_marker_get_buffer#} mark

-- @method sourceMarkerNext@
-- 
sourceMarkerNext :: SourceMarker -> IO SourceMarker
sourceMarkerNext mark = makeNewGObject mkSourceMarker $
  {#call unsafe source_marker_next#} mark

-- @method sourceMarkerPrev@
-- 
sourceMarkerPrev :: SourceMarker -> IO SourceMarker
sourceMarkerPrev mark = makeNewGObject mkSourceMarker $
  {#call unsafe source_marker_prev#} mark

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	15 Nov 2003 10:34:42 -0000	1.6
+++ Makefile	19 Nov 2003 19:33:55 -0000	1.7
@@ -28,6 +28,7 @@
 SourceTagTable-HEADER		= gtksourceview/gtksourcetagtable.h
 SourceTagStyle-HEADER		= gtksourceview/gtksourcetagstyle.h
 SourcePringJob-HEADER		= gtksourceview/gtksourceprintjob.h
+SourceStyleScheme-HEADER        = gtksourceview/gtksourcestylescheme.h
 endif
 
 # Further options to the C preprocessor are passed verbatim:

Index: SourceBuffer.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceBuffer.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SourceBuffer.chs	26 Oct 2003 22:29:51 -0000	1.2
+++ SourceBuffer.chs	19 Nov 2003 19:33:55 -0000	1.3
@@ -32,10 +32,13 @@
   sourceBufferNewWithLanguage,
   sourceBufferSetCheckBrackets,
   sourceBufferGetCheckBrackets,
---  sourceBufferSetBracketsMatchStyle,
+  sourceBufferSetBracketsMatchStyle,
   sourceBufferSetHighlight,
-  sourceBufferGetHighlight
-{-
+  sourceBufferGetHighlight,
+  sourceBufferSetMaxUndoLevels,
+  sourceBufferGetMaxUndoLevels,
+  sourceBufferSetLanguage,
+  sourceBufferGetLanguage,
   sourceBufferSetEscapeChar,
   sourceBufferGetEscapeChar,
   sourceBufferCanUndo,
@@ -54,7 +57,6 @@
   sourceBufferGetIterAtMarker,
   sourceBufferGetNextMarker,
   sourceBufferGetPrevMarker
--}
 ) where
 
 import Monad	(liftM)
@@ -66,7 +68,9 @@
 {#import SourceViewType#}
 {#import Signal#}
 import SourceTagStyle
-import GList	(fromGList)
+import SourceMarker
+{#import TextIter#}
+import GList	(fromGSList)
 
 {# context lib="gtk" prefix="gtk" #}
 
@@ -99,13 +103,13 @@
 sourceBufferGetCheckBrackets sb = liftM toBool $
   {#call unsafe source_buffer_get_check_brackets#} sb
 
-{-
 -- @method sourceBufferSetBracketsMatchStyle@
 --
 sourceBufferSetBracketsMatchStyle :: SourceBuffer -> SourceTagStyle -> IO () 
-sourceBufferSetBracketsMatchStyle sb ts = liftM toBool $
-  {#call unsafe source_buffer_set_bracket_match_style#} sb ts
--}
+sourceBufferSetBracketsMatchStyle sb ts =
+  alloca $ \tsPtr -> do
+  poke tsPtr ts
+  {#call unsafe source_buffer_set_bracket_match_style#} sb (castPtr tsPtr)
 
 -- @method sourceBufferSetHighlight@
 --
@@ -142,3 +146,126 @@
 sourceBufferGetLanguage :: SourceBuffer -> IO SourceLanguage
 sourceBufferGetLanguage sb = makeNewGObject mkSourceLanguage $
   {#call unsafe source_buffer_get_language#} sb
+
+-- @method sourceBufferSetEscapeChar@
+--
+sourceBufferSetEscapeChar :: SourceBuffer -> Char -> IO ()
+sourceBufferSetEscapeChar sb char =
+  {#call unsafe source_buffer_set_escape_char#} sb ((toEnum . fromEnum) char)
+  
+-- @method sourceBufferGetEscapeChar@
+--
+sourceBufferGetEscapeChar :: SourceBuffer -> IO Char
+sourceBufferGetEscapeChar sb = liftM (toEnum . fromEnum) $
+  {#call unsafe source_buffer_get_escape_char#} sb
+
+-- @method sourceBufferCanUndo@
+--
+sourceBufferCanUndo :: SourceBuffer -> IO Bool
+sourceBufferCanUndo sb = liftM toBool $
+  {#call unsafe source_buffer_can_undo#} sb
+  
+-- @method sourceBufferCanRedo@
+--
+sourceBufferCanRedo :: SourceBuffer -> IO Bool
+sourceBufferCanRedo sb = liftM toBool $
+  {#call unsafe source_buffer_can_redo#} sb
+
+-- @method sourceBufferUndo@
+--
+sourceBufferUndo :: SourceBuffer -> IO ()
+sourceBufferUndo sb =
+  {#call source_buffer_undo#} sb
+  
+-- @method sourceBufferRedo@
+--
+sourceBufferRedo :: SourceBuffer -> IO ()
+sourceBufferRedo sb =
+  {#call source_buffer_redo#} sb
+
+-- @method sourceBufferBeginNotUndoableAction@
+--
+sourceBufferBeginNotUndoableAction :: SourceBuffer -> IO ()
+sourceBufferBeginNotUndoableAction sb =
+  {#call source_buffer_begin_not_undoable_action#} sb
+  
+-- @method sourceBufferEndNotUndoableAction@
+--
+sourceBufferEndNotUndoableAction :: SourceBuffer -> IO ()
+sourceBufferEndNotUndoableAction sb =
+  {#call source_buffer_end_not_undoable_action#} sb
+
+-- @method sourceBufferCreateMarker@
+--
+sourceBufferCreateMarker :: SourceBuffer -> String -> String -> TextIter -> IO SourceMarker
+sourceBufferCreateMarker sb name markerType iter =
+  makeNewGObject mkSourceMarker $
+  withCString name       $ \strPtr1 ->
+  withCString markerType $ \strPtr2 ->
+  {#call source_buffer_create_marker#} sb strPtr1 strPtr2 iter
+
+-- @method sourceBufferMoveMarker@
+--
+sourceBufferMoveMarker :: SourceBuffer -> SourceMarker -> TextIter -> IO ()
+sourceBufferMoveMarker sb mark iter =
+  {#call source_buffer_move_marker#} sb mark iter
+
+-- @method sourceBufferDeleteMarker@
+--
+sourceBufferDeleteMarker :: SourceBuffer -> SourceMarker -> IO ()
+sourceBufferDeleteMarker sb mark =
+  {#call source_buffer_delete_marker#} sb mark
+
+-- @method sourceBufferGetMarker@
+--
+sourceBufferGetMarker :: SourceBuffer -> String -> IO SourceMarker
+sourceBufferGetMarker sb name =
+  makeNewGObject mkSourceMarker $
+  withCString name $ \strPtr1 ->
+  {#call unsafe source_buffer_get_marker#} sb strPtr1
+
+-- @method sourceBufferGetMarkersInRegion@
+--
+sourceBufferGetMarkersInRegion :: SourceBuffer -> TextIter -> TextIter -> IO [SourceMarker]
+sourceBufferGetMarkersInRegion sb begin end = do
+  gList <- {#call unsafe source_buffer_get_markers_in_region#} sb begin end
+  wList <- fromGSList gList
+  mapM (makeNewGObject mkSourceMarker) (map return wList)
+
+-- @method sourceBufferGetFirstMarker@
+--
+sourceBufferGetFirstMarker :: SourceBuffer -> IO SourceMarker
+sourceBufferGetFirstMarker sb =
+  makeNewGObject mkSourceMarker $
+  {#call unsafe source_buffer_get_first_marker#} sb
+
+-- @method sourceBufferGetLastMarker@
+--
+sourceBufferGetLastMarker :: SourceBuffer -> IO SourceMarker
+sourceBufferGetLastMarker sb =
+  makeNewGObject mkSourceMarker $
+  {#call unsafe source_buffer_get_last_marker#} sb
+
+-- @method sourceBufferGetIterAtMarker@
+--
+sourceBufferGetIterAtMarker :: SourceBuffer -> SourceMarker -> IO TextIter
+sourceBufferGetIterAtMarker sb mark = do
+  iter <- makeEmptyTextIter
+  {#call unsafe source_buffer_get_iter_at_marker#} sb iter mark
+  return iter
+
+-- @method sourceBufferGetNextMarker@
+--
+sourceBufferGetNextMarker :: SourceBuffer -> TextIter -> IO (Maybe SourceMarker)
+sourceBufferGetNextMarker sb iter = do
+  markPtr <- {#call unsafe source_buffer_get_next_marker#} sb iter
+  if markPtr==nullPtr then return Nothing
+                      else liftM Just $ makeNewGObject mkSourceMarker (return markPtr)
+
+-- @method sourceBufferGetPrevMarker@
+--
+sourceBufferGetPrevMarker :: SourceBuffer -> TextIter -> IO (Maybe SourceMarker)
+sourceBufferGetPrevMarker sb iter = do
+  markPtr <- {#call unsafe source_buffer_get_prev_marker#} sb iter
+  if markPtr==nullPtr then return Nothing
+                      else liftM Just $ makeNewGObject mkSourceMarker (return markPtr)

Index: SourceLanguage.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceLanguage.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceLanguage.chs	21 Oct 2003 23:41:03 -0000	1.1
+++ SourceLanguage.chs	19 Nov 2003 19:33:55 -0000	1.2
@@ -31,13 +31,13 @@
   sourceLanguageGetSection,
   sourceLanguageGetTags,
   sourceLanguageGetEscapeChar,
---  sourceLanguageGetMimeTypes,
---  sourceLanguageSetMimeTypes,
---  sourceLanguageGetStyleScheme,
---  sourceLanguageSetStyleScheme,
---  sourceLanguageGetTagStyle,
---  sourceLanguageSetTagStyle,
---  sourceLanguageGetTagDefaultStyle
+  sourceLanguageGetMimeTypes,
+  sourceLanguageSetMimeTypes,
+  sourceLanguageGetStyleScheme,
+  sourceLanguageSetStyleScheme,
+  sourceLanguageGetTagStyle,
+  sourceLanguageSetTagStyle,
+  sourceLanguageGetTagDefaultStyle
 ) where
 
 import Monad	(liftM)
@@ -47,7 +47,9 @@
 {#import Hierarchy#}
 {#import SourceViewType#}
 {#import Signal#}
-import GList	(readGSList)
+import SourceStyleScheme
+import SourceTagStyle
+import GList	(fromGSList, toGSList)
 
 {# context lib="gtk" prefix="gtk" #}
 
@@ -58,20 +60,20 @@
 --
 sourceLanguageGetName :: SourceLanguage -> IO String
 sourceLanguageGetName sl =
-  {#call unsafe source_language_get_name#} sl >>= peekCString
+  {#call unsafe source_language_get_name#} sl >>= peekUTFString
 
 -- @method sourceLanguageGetSection@
 --
 sourceLanguageGetSection :: SourceLanguage -> IO String
 sourceLanguageGetSection sl =
-  {#call unsafe source_language_get_section#} sl >>= peekCString
+  {#call unsafe source_language_get_section#} sl >>= peekUTFString
 
 -- @method sourceLanguageGetTags@
 --
 sourceLanguageGetTags :: SourceLanguage -> IO [SourceTag]
 sourceLanguageGetTags sl = do
   gList <- {#call unsafe source_language_get_tags#} sl
-  wList <- readGSList gList
+  wList <- fromGSList gList
   mapM (makeNewGObject mkSourceTag) (map return wList)
 
 -- @method sourceLanguageGetEscapeChar@
@@ -80,7 +82,19 @@
 sourceLanguageGetEscapeChar sl = liftM (toEnum . fromEnum) $
   {#call unsafe source_language_get_escape_char#} sl
 
-{-
+sourceLanguageGetMimeTypes :: SourceLanguage -> IO [String]
+sourceLanguageGetMimeTypes sl = do
+  mimeTypesList <- {#call unsafe source_language_get_mime_types#} sl
+  mimeTypesPtrs <- fromGSList mimeTypesList
+  mapM peekUTFString mimeTypesPtrs
+
+sourceLanguageSetMimeTypes :: SourceLanguage -> [String] -> IO ()
+sourceLanguageSetMimeTypes sl mimeTypes = do
+  mimeTypesPtrs <- mapM newUTFString mimeTypes
+  mimeTypesList <- toGSList mimeTypesPtrs
+  {#call unsafe source_language_set_mime_types#} sl mimeTypesList
+  {#call unsafe g_slist_free#} mimeTypesList
+
 -- @method sourceLanguageGetStyleScheme@
 --
 sourceLanguageGetStyleScheme :: SourceLanguage -> IO SourceStyleScheme
@@ -91,23 +105,29 @@
 --
 sourceLanguageSetStyleScheme :: SourceLanguage -> SourceStyleScheme -> IO ()
 sourceLanguageSetStyleScheme sl ss =
-  {#call unsafe source_language_get_style_scheme#} sl ss
+  {#call unsafe source_language_set_style_scheme#} sl ss
 
 -- @method sourceLanguageGetTagStyle@
 --
 sourceLanguageGetTagStyle :: SourceLanguage -> String -> IO SourceTagStyle
-sourceLanguageGetTagStyle sl tag = makeNewGObject mkSourceTagStyle $
-  {#call unsafe source_language_get_tag_style#} sl tag
+sourceLanguageGetTagStyle sl tag =
+  withCString  tag  $ \strPtr1 -> do
+  sts <- {#call unsafe source_language_get_tag_style#} sl strPtr1
+  peek (castPtr sts)
 
 -- @method sourceLanguageSetTagStyle@
 --
 sourceLanguageSetTagStyle :: SourceLanguage -> String -> SourceTagStyle -> IO ()
-sourceLanguageSetTagStyle sl tag sts =
-  {#call unsafe source_language_set_tag_style#} sl tag sts
+sourceLanguageSetTagStyle sl tag sts =  
+  withCString  tag  $ \strPtr1 ->
+  alloca            $ \sts' -> do
+  poke sts' sts
+  {#call unsafe source_language_set_tag_style#} sl strPtr1 (castPtr sts')
 
 -- @method sourceLanguageGetTagDefaultStyle@
 --
 sourceLanguageGetTagDefaultStyle :: SourceLanguage -> String -> IO SourceTagStyle
-sourceLanguageGetTagDefaultStyle sl tag = makeNewGObject mkSourceTagStyle $
-  {#call unsafe source_language_get_tag_default_style#} sl tag 
--}
+sourceLanguageGetTagDefaultStyle sl tag =
+  withCString  tag  $ \strPtr1 -> do
+  sts <- {#call unsafe source_language_get_tag_default_style#} sl strPtr1
+  peek (castPtr sts)

Index: SourceStyleScheme.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceStyleScheme.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceStyleScheme.chs	26 Oct 2003 22:29:51 -0000	1.1
+++ SourceStyleScheme.chs	19 Nov 2003 19:33:55 -0000	1.2
@@ -41,15 +41,6 @@
 
 {# context lib="gtk" prefix="gtk" #}
 
-{#pointer *SourceStyleScheme foreign newtype #}
-
-mkSourceStyleScheme = SourceStyleScheme
-unSourceStyleScheme (SourceStyleScheme o) = o
-
-instance GObjectClass SourceStyleScheme where
-  toGObject   = mkGObject.castForeignPtr.unSourceStyleScheme
-  fromGObject = mkSourceStyleScheme.castForeignPtr.unGObject
-
 -- methods
 
 -- @method sourceStyleSchemeGetTagStyle@
@@ -66,7 +57,7 @@
 -- 
 sourceStyleSchemeGetName :: SourceStyleScheme -> IO String
 sourceStyleSchemeGetName ss =
-  {#call source_style_scheme_get_name#} ss >>= peekCString
+  {#call source_style_scheme_get_name#} ss >>= peekUTFString
 
 -- @method sourceStyleSchemeGetDefault@
 -- 

Index: sourceview.h
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sourceview.h	17 Nov 2003 15:48:29 -0000	1.2
+++ sourceview.h	19 Nov 2003 19:33:55 -0000	1.3
@@ -1,4 +1,5 @@
 #include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksourcemarker.h>
 #include <gtksourceview/gtksourcelanguagesmanager.h>
 #include <gtksourceview/gtksourcetag.h>
 #include <gtksourceview/gtksourcemarker.h>

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen hierarchy.list,1.2,1.3

[<dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv32409

Modified Files:
	hierarchy.list 
Log Message:
added GtkSourceStyleScheme interface


Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hierarchy.list	17 Nov 2003 15:48:29 -0000	1.2
+++ hierarchy.list	19 Nov 2003 19:32:21 -0000	1.3
@@ -151,6 +151,8 @@
 	GtkIconFactory
         GtkSourceLanguage		if sourceview
         GtkSourceLanguagesManager	if sourceview
+#this one is actualy an interface, but all interface implementations must be GObjects
+	GtkSourceStyleScheme		if sourceview
 # This now became a GObject in version 2:
 	GdkGC				as GC, gdk_gc_get_type
 # These are Pango structures

[Gtk2hs-commit] gtk2hs/demo/sourceview SourceViewTest.hs,1.1,1.2

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv29174

Modified Files:
	SourceViewTest.hs 
Log Message:
Make the sourceview demo more user friendly.


Index: SourceViewTest.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/sourceview/SourceViewTest.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceViewTest.hs	11 Nov 2003 12:24:35 -0000	1.1
+++ SourceViewTest.hs	18 Nov 2003 22:57:59 -0000	1.2
@@ -15,7 +15,13 @@
 
   -- create the appropriate language
   lm <- sourceLanguagesManagerNew
-  Just lang <- sourceLanguagesManagerGetLanguageFromMimeType lm "text/x-haskell"
+  langM <- sourceLanguagesManagerGetLanguageFromMimeType lm "text/x-haskell"
+  lang <- case langM of
+    (Just lang) -> return lang
+    Nothing -> do
+      langDirs <- sourceLanguagesManagerGetLangFilesDirs lm
+      error ("please copy haskell.lang to one of the following directories:\n"
+	     ++unlines langDirs)
 
   -- create a new SourceBuffer object
   buffer <- sourceBufferNewWithLanguage lang

[Gtk2hs-commit] gtk2hs ChangeLog,1.116,1.117

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv29038

Modified Files:
	ChangeLog 
Log Message:
Made the sourceview demo more user friendly.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ChangeLog	17 Nov 2003 23:54:28 -0000	1.116
+++ ChangeLog	18 Nov 2003 22:57:05 -0000	1.117
@@ -1,5 +1,10 @@
-2003-11-17 Axel Simon <A....@ke...>
+2003-11-18 Axel Simon <A....@ke...>
 
+	* demo/sourceview/Sourceview.hs: Give an error message if the
+	language spec file is not found.
+	
+2003-11-17 Axel Simon <A....@ke...>
+	
 	* c2hs/gen/GenBind.hs: Do not peek through C typedefs when
 	determining the C type equivalent of a Haskell type. This corrects
 	a problem with GtkSourceViewMarker which is a typedef of

[Gtk2hs-commit] gtk2hs/sourceview SourceLanguagesManager.chs,1.3,1.4

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv10320/sourceview

Modified Files:
	SourceLanguagesManager.chs 
Log Message:
Don't chase typedefs when determining the C types of pointer hooks.
Complete a function.


Index: SourceLanguagesManager.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/SourceLanguagesManager.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SourceLanguagesManager.chs	2 Nov 2003 23:57:58 -0000	1.3
+++ SourceLanguagesManager.chs	17 Nov 2003 23:54:29 -0000	1.4
@@ -30,9 +30,10 @@
   sourceLanguagesManagerNew,
   sourceLanguagesManagerGetAvailableLanguages,
   sourceLanguagesManagerGetLanguageFromMimeType,
-) where
+  sourceLanguagesManagerGetLangFilesDirs
+  ) where
 
-import Monad	(liftM)
+import Monad	(liftM, mapM)
 import FFI
 import GObject	(makeNewGObject)
 {#import Hierarchy#}
@@ -46,7 +47,7 @@
 -- methods
 
 -- @constructor sourceLanguagesManagerNew@ Create a new
--- @ref type SourceLanguagesManager@
+-- @ref type SourceLanguagesManager@.
 --
 sourceLanguagesManagerNew :: IO SourceLanguagesManager
 sourceLanguagesManagerNew = makeNewGObject mkSourceLanguagesManager
@@ -70,12 +71,14 @@
   if langPtr==nullPtr then return Nothing else liftM Just $
     makeNewGObject mkSourceLanguage (return langPtr)
 
-{-
--- @method sourceLanguagesManagerGetLangFilesDirs@
+-- @method sourceLanguagesManagerGetLangFilesDirs@ Retrieve filenames with
+-- language specifications.
 -- 
-sourceLanguagesManagerGetLangFilesDirs :: SourceLanguagesManager -> IO [FilePath]
+sourceLanguagesManagerGetLangFilesDirs :: SourceLanguagesManager -> 
+					  IO [FilePath]
 sourceLanguagesManagerGetLangFilesDirs lm = do
-  gList <- {#call source_languages_manager_get_lang_files_dirs#} lm
-  wList <- readGSList gList
-  return the wList, converted to strings
--}
+  gsList <- {#call source_languages_manager_get_lang_files_dirs#} lm
+  -- The returned structure is private and nothing is to be freed.
+  dirList <- readGSList gsList
+  mapM peekUTFString dirList
+

[Gtk2hs-commit] gtk2hs ChangeLog,1.115,1.116

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv10320

Modified Files:
	ChangeLog 
Log Message:
Don't chase typedefs when determining the C types of pointer hooks.
Complete a function.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- ChangeLog	17 Nov 2003 17:47:24 -0000	1.115
+++ ChangeLog	17 Nov 2003 23:54:28 -0000	1.116
@@ -1,5 +1,15 @@
 2003-11-17 Axel Simon <A....@ke...>
 
+	* c2hs/gen/GenBind.hs: Do not peek through C typedefs when
+	determining the C type equivalent of a Haskell type. This corrects
+	a problem with GtkSourceViewMarker which is a typedef of
+	GtkTextMark. c2hs generated an interface file which said that all
+	GtkTextMarks are now SourceViews in Haskell. This was a bug in
+	c2hs.
+
+	* sourceview/SourceLanguagesManager.chs: Completed
+	sourceLanguagesManagerGetLangFilesDirs.
+
 	* mk/library.mk: Install one file and one directory at a time. The
 	local install-sh script cannot cope with more.
 	

[Gtk2hs-commit] gtk2hs/c2hs/gen GenBind.hs,1.4,1.5

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/c2hs/gen
In directory sc8-pr-cvs1:/tmp/cvs-serv10320/c2hs/gen

Modified Files:
	GenBind.hs 
Log Message:
Don't chase typedefs when determining the C types of pointer hooks.
Complete a function.


Index: GenBind.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/c2hs/gen/GenBind.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GenBind.hs	9 Jul 2003 21:12:27 -0000	1.4
+++ GenBind.hs	17 Nov 2003 23:54:28 -0000	1.5
@@ -139,7 +139,7 @@
 		   applyPrefixToNameSpaces, isTypedef, simplifyDecl,
 		   declrFromDecl, declrNamed, structMembers, structName,
 		   tagName, declaredName , structFromDecl, funResultAndArgs,
-		   chaseDecl, findAndChaseDecl, checkForAlias,
+		   chaseDecl, findAndChaseDecl, findObjShadow, checkForAlias,
 		   checkForOneAliasName, lookupEnum,  lookupStructUnion,
 		   lookupDeclOrTag, isPtrDeclr, dropPtrDeclr, isPtrDecl,
 		   getDeclOf, isFunDeclr, refersToNewDef, CDef(..))
@@ -463,7 +463,8 @@
 	    --   allow `... -> fun HSTYPE' to explicitly mark function
 	    --   types if this ever becomes important
 	traceInfoHsType hsName hsType
-	pointerDef isStar cNameFull hsName ptrKind isNewtype hsType isFun
+	realCName <- liftM (maybe cName snd) $ findObjShadow cName
+	pointerDef isStar realCName hsName ptrKind isNewtype hsType isFun
       Right tag -> do			        -- found a tag definition
         let cNameFull = tagName tag
 	traceInfoCName "tag definition" cNameFull

[Gtk2hs-commit] gtk2hs ChangeLog,1.114,1.115

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv25878

Modified Files:
	ChangeLog 
Log Message:
Remove unused substitutions.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- ChangeLog	17 Nov 2003 17:33:39 -0000	1.114
+++ ChangeLog	17 Nov 2003 17:47:24 -0000	1.115
@@ -3,7 +3,8 @@
 	* mk/library.mk: Install one file and one directory at a time. The
 	local install-sh script cannot cope with more.
 	
-	* configure.in: Mange Cygwin paths properly. Not tested.
+	* configure.in: Mange Cygwin paths properly. Not tested. Remove
+	unused substitutions.
 	
 	* tools/hierarchyGen/TypeGen.hs: Make parser accept both "if" and
 	"as" statements.

[Gtk2hs-commit] gtk2hs configure.in,1.32,1.33

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv25804

Modified Files:
	configure.in 
Log Message:
Remove unused substitutions.


Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure.in	17 Nov 2003 17:29:01 -0000	1.32
+++ configure.in	17 Nov 2003 17:47:04 -0000	1.33
@@ -480,10 +480,6 @@
 dnl Needed substitution.
 AC_SUBST(PWD)
 AC_SUBST(TOP)
-AC_SUBST(GTK_CFLGAS)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
 AC_SUBST(BUILT_IN_C2HS)
 AC_SUBST(MULTIPLE_CHS)
 AC_SUBST(FOUR_WORD_CALLBACK)

[Gtk2hs-commit] gtk2hs ChangeLog,1.113,1.114

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv23340

Modified Files:
	ChangeLog 
Log Message:
Cygwin paths and install-sh workaround.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- ChangeLog	17 Nov 2003 15:48:29 -0000	1.113
+++ ChangeLog	17 Nov 2003 17:33:39 -0000	1.114
@@ -1,5 +1,10 @@
 2003-11-17 Axel Simon <A....@ke...>
 
+	* mk/library.mk: Install one file and one directory at a time. The
+	local install-sh script cannot cope with more.
+	
+	* configure.in: Mange Cygwin paths properly. Not tested.
+	
 	* tools/hierarchyGen/TypeGen.hs: Make parser accept both "if" and
 	"as" statements.
 

[Gtk2hs-commit] gtk2hs/mk library.mk,1.21,1.22

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv23011/mk

Modified Files:
	library.mk 
Log Message:
Install one file and one directory at a time. The local install-sh
script is limited in this way.


Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- library.mk	16 Nov 2003 12:16:30 -0000	1.21
+++ library.mk	17 Nov 2003 17:32:29 -0000	1.22
@@ -53,18 +53,22 @@
 	fi
 
 installdirs :
-	$(INSTALL_DIR) $(DESTDIR)$(INST_LIBDIR) $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_INCLDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_HIDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLDIR)
 
 install-without-pkg : $(TARGETOK) installdirs installfiles
 
 install : install-without-pkg install-pkg
 
 installfiles : $(PACKAGENAME).conf
-	$(INSTALL_DATA) $(ALLHSFILES:.hs=.hi) $(DESTDIR)$(INST_HIDIR)
+	for file in $(ALLHSFILES:.hs=.hi); do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(INST_HIDIR); done;
 	$(INSTALL_DATA) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)
 	$(TOUCH) -r $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)/$(TARGETOK)
 ifneq ($(strip $(STUBHFILES) $(EXTRA_HFILESOK)),)
-	$(INSTALL_DATA) $(STUBHFILES) $(EXTRA_HFILESOK) $(DESTDIR)$(INST_INCLDIR)
+	for file in $(STUBHFILES) $(EXTRA_HFILESOK); do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(INST_INCLDIR); done;
 endif
 	$(INSTALL_DATA) $(PACKAGENAME).conf $(DESTDIR)$(INST_LIBDIR)
 

[Gtk2hs-commit] gtk2hs configure.in,1.31,1.32

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv22214

Modified Files:
	configure.in 
Log Message:
Tentatively change the way Cygwin paths are mangled. Not tested.


Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.in	16 Nov 2003 13:43:14 -0000	1.31
+++ configure.in	17 Nov 2003 17:29:01 -0000	1.32
@@ -81,7 +81,11 @@
   DLSUFFIX=".dll";
   DLPREFIX="";
   dnl replace something like /c/ with c:/
-  PATHSED=["s+/\([a-z]\)/+\1:/+"];
+  case $host_os in
+    *cygwin* ) PATHSED=["s+/cygdrive/\([a-z]\)/+\1:/+"];;
+    *mingw32* ) PATHSED=["s+/\([a-z]\)/+\1:/+"];;
+    * ) PATHSED=["\#"];; 
+  esac;
   HSCFLAGS=" -C -optc-fnative-struct";
   C2HSFLAGS=;
   dnl Where are we? (only used during configuration)

[Gtk2hs-commit] gtk2hs/sourceview sourceview.h,1.1,1.2

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1:/tmp/cvs-serv437/sourceview

Modified Files:
	sourceview.h 
Log Message:
Add the sourceviewmarker type. Correct a bug in the type hierarchy generator.


Index: sourceview.h
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sourceview.h	21 Oct 2003 23:42:03 -0000	1.1
+++ sourceview.h	17 Nov 2003 15:48:29 -0000	1.2
@@ -1,3 +1,5 @@
 #include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksourcelanguagesmanager.h>
 #include <gtksourceview/gtksourcetag.h>
+#include <gtksourceview/gtksourcemarker.h>
+

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen TypeGen.hs,1.1,1.2 hierarchy.list,1.1,1.2

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1:/tmp/cvs-serv437/tools/hierarchyGen

Modified Files:
	TypeGen.hs hierarchy.list 
Log Message:
Add the sourceviewmarker type. Correct a bug in the type hierarchy generator.


Index: TypeGen.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/TypeGen.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TypeGen.hs	15 Nov 2003 09:46:22 -0000	1.1
+++ TypeGen.hs	17 Nov 2003 15:48:29 -0000	1.2
@@ -65,7 +65,7 @@
       r -> (origName, Nothing, r)
     parents = dropWhile (\(c,_) -> c>=col ps) (hierObjs ps)
     spec = (col ps,name):parents
-    (readTag, rem'') = case (dropWhile isBlank rem) of
+    (readTag, rem'') = case (dropWhile isBlank rem') of
       ('i':'f':r) -> span isAlphaNum_ (dropWhile isBlank r)
       r -> ("default",r)
 

Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hierarchy.list	15 Nov 2003 09:46:22 -0000	1.1
+++ hierarchy.list	17 Nov 2003 15:48:29 -0000	1.2
@@ -33,6 +33,7 @@
         GdkPixbuf			as Pixbuf, gdk_pixbuf_get_type
         GtkTextChildAnchor
         GtkTextMark
+	    GtkSourceMarker	if sourceview
         GtkObject
             GtkWidget
                 GtkMisc

[Gtk2hs-commit] gtk2hs ChangeLog,1.112,1.113

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv437

Modified Files:
	ChangeLog 
Log Message:
Add the sourceviewmarker type. Correct a bug in the type hierarchy generator.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- ChangeLog	16 Nov 2003 13:43:14 -0000	1.112
+++ ChangeLog	17 Nov 2003 15:48:29 -0000	1.113
@@ -1,3 +1,13 @@
+2003-11-17 Axel Simon <A....@ke...>
+
+	* tools/hierarchyGen/TypeGen.hs: Make parser accept both "if" and
+	"as" statements.
+
+	* sourceview/sourceview.h: Added the gtksourceviewmarker.h to the
+	include file list.
+
+	* hierarchyGen/hierarchy.list: Added SourceviewMarker.
+
 2003-11-16 Axel Simon <A....@ke...>
 
 	* configure.in, INSTALL: Documentation updates. In particular, the