Major cleanup of ffi abstraction layer

[clg] / gdk / gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index c2583779ea80e9ba58663eb7ee4b5ed53c6da653..497b985f4ba9073aa07a99635c4f1a4e271eed60 100644 (file)
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gdk.lisp,v 1.10 2004-10-31 11:51:08 espen Exp $
+;; $Id: gdk.lisp,v 1.11 2004-11-06 21:39:58 espen Exp $

 
 
 (in-package "GDK")
 
 
 (in-package "GDK")


@@ -30,11 +30,12 @@ (defbinding (gdk-init "gdk_parse_args") () nil
 
 ;;; Display
 
 
 ;;; Display
 

-(defbinding %display-manager-get () display-manager)
+(defbinding (display-manager "gdk_display_manager_get") () display-manager)
+

 
 (defbinding (display-set-default "gdk_display_manager_set_default_display")
     (display) nil
 
 (defbinding (display-set-default "gdk_display_manager_set_default_display")
     (display) nil

-  ((%display-manager-get) display-manager)
+  ((display-manager) display-manager)

   (display display))
 
 (defbinding display-get-default () display)
   (display display))
 
 (defbinding display-get-default () display)


@@ -318,15 +319,6 @@ (defbinding rgb-init () nil)
 
 ;;; Cursor
 
 
 ;;; Cursor
 

-(deftype-method alien-ref cursor (type-spec)
-  (declare (ignore type-spec))
-  '%cursor-ref)
-
-(deftype-method alien-unref cursor (type-spec)
-  (declare (ignore type-spec))
-  '%cursor-unref)
-
-

 (defbinding cursor-new () cursor
   (cursor-type cursor-type))
 
 (defbinding cursor-new () cursor
   (cursor-type cursor-type))
 


@@ -338,10 +330,19 @@ (defbinding cursor-new-from-pixmap () cursor
   (x int) (y int))
 
 (defbinding %cursor-ref () pointer
   (x int) (y int))
 
 (defbinding %cursor-ref () pointer

-  (cursor (or cursor pointer)))
+  (location pointer))

 
 (defbinding %cursor-unref () nil
 
 (defbinding %cursor-unref () nil

-  (cursor (or cursor pointer)))
+  (location pointer))
+
+(defmethod reference-foreign ((class (eql (find-class 'cursor))) location)
+  (declare (ignore class))
+  (%cursor-ref location))
+
+(defmethod unreference-foreign ((class (eql (find-class 'cursor))) location)
+  (declare (ignore class))
+  (%cursor-unref location))
+