Fixed wrong foreign function name

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 223dadeb5acc35be5a464008570efe44d5f94383..ae7f422fb58885183c300774b85c5af0da7a7b7c 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -1,431 +1,258 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2000 Espen S. Johnsen <esj@ostud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>

 ;;
 ;;

-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:

 ;;
 ;;

-;; This library 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
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.

 ;;
 ;;

-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 
 

-;; $Id: gtkobject.lisp,v 1.7 2000-11-09 20:30:16 espen Exp $
+;; $Id: gtkobject.lisp,v 1.43 2007-06-25 13:56:56 espen Exp $

 
 
 (in-package "GTK")
 
 
 
 
 (in-package "GTK")
 
 

-;;;; Initializing
-
-(setf (alien-type-name 'pointer) "gpointer")
-
-
-;;;; Misc utils
-
-(defun name-to-string (name)
-  (substitute #\_ #\- (string-downcase (string name))))
-
-(defun string-to-name (name &optional (package "KEYWORD"))
-  (intern (substitute #\- #\_ (string-upcase name)) package))
-
-
-;;;; Argument stuff
-
-(deftype arg () 'pointer)
-
-(defconstant +arg-type-offset+ 0)
-(defconstant +arg-name-offset+ 4)
-(defconstant +arg-value-offset+ 8)
-(defconstant +arg-size+ 16)
-
-(define-foreign arg-new () arg
-  (type type-number))
-
-(define-foreign %arg-free () nil
-  (arg arg)
-  (free-contents boolean))
-
-(defun arg-free (arg free-contents &optional alien)
-  (cond
-   (alien (%arg-free arg free-contents))
-   (t
-    (unless (null-pointer-p arg)
-      (when free-contents
-       (funcall
-        (get-destroy-function (type-from-number (arg-type arg)))
-        arg +arg-value-offset+))
-      (deallocate-memory arg)))))
-
-(define-foreign %arg-reset () nil
-  (arg arg))
-
-(defun arg-name (arg)
-  (funcall (get-reader-function '(static string)) arg +arg-name-offset+))
-
-(defun (setf arg-name) (name arg)
-  (funcall (get-writer-function '(static string)) name arg +arg-name-offset+)
-  name)
-
-(defun arg-type (arg)
-  (system:sap-ref-32 arg +arg-type-offset+))
-
-(defun (setf arg-type) (type arg)
-  (setf (system:sap-ref-32 arg +arg-type-offset+) type))
-
-(defun arg-value (arg &optional (type (type-from-number (arg-type arg))))
-  (funcall (get-reader-function type) arg +arg-value-offset+))
-
-;; One should never call this function on an arg whose value is already set
-(defun (setf arg-value)
-    (value arg &optional (type (type-from-number (arg-type arg))))
-  (funcall (get-writer-function type) value arg +arg-value-offset+)
-  value)
-
-(defun (setf return-arg-value)
-    (value arg &optional (type (type-from-number (arg-type arg))))
-  ; this is probably causing a memory leak
-  (funcall (get-writer-function type) value (arg-value arg 'pointer) 0)
-  value)
-
-(defun arg-array-ref (arg0 index)
-  (system:sap+ arg0 (* index +arg-size+)))
-
-

 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass object (gobject)
+  (init-types-in-library gtk "libgtk-2.0")
+
+  (defclass %object (gobject)

     ()
     ()

-;   ((flags
-;     :allocation :alien
-;     :accessor object-flags
-;     :type object-flags))

     (:metaclass gobject-class)
     (:metaclass gobject-class)

-    (:alien-name "GtkObject")))
+    (:gtype |gtk_object_get_type|)))

 
 
 
 

-(defmethod shared-initialize ((object object) names &rest initargs &key signals)
-  (declare (ignore initargs names))
+(defmethod initialize-instance ((object %object) &rest initargs &key signal)
+  (declare (ignore signal))

   (call-next-method)
   (call-next-method)

-  (dolist (signal signals)
-    (apply #'signal-connect object signal)))
-
+  (dolist (signal-definition (get-all initargs :signal))
+    (apply #'signal-connect object signal-definition)))

 
 

-(defmethod initialize-instance :after ((object object) &rest initargs &key)
-  (declare (ignore initargs))
-  (object-default-construct object)
-  (reference-instance object)
-  (object-sink object))
-
-
-(defmethod from-alien-initialzie-instance ((object object) &rest initargs)
+(defmethod initialize-instance :around ((object %object) &rest initargs)

   (declare (ignore initargs))
   (call-next-method)
   (declare (ignore initargs))
   (call-next-method)

-  (object-sink object))
-
-
-(define-foreign object-default-construct () nil
-  (object object))
+  ;; Add a temorary reference which will be removed when the object is
+  ;; sinked
+  (funcall (reference-function '%object) (foreign-location object))
+  (%object-sink object))

 
 

-(define-foreign object-sink () nil
-  (object object))
+(defbinding %object-sink () nil
+  (object %object))

 
 

-(define-foreign ("gtk_object_getv" object-get-arg) () nil
-  (object object)
-  (1 unsigned-int)
-  (arg arg))
+;;;; Main loop and event handling

 
 

-(define-foreign ("gtk_object_setv" object-set-arg) () nil
-  (object object)
-  (1 unsigned-int)
-  (arg arg))
+(defbinding events-pending-p () boolean)

 
 

-(defun object-arg (object name)
-  (with-gc-disabled
-    (let ((arg (arg-new 0)))
-      (setf (arg-name arg) name)
-      (object-get-arg object arg)
-      (let ((type (type-from-number (arg-type arg))))
-       (prog1
-           (arg-value arg type)
-         (arg-free arg t))))))
+(defbinding get-current-event () gdk:event)

 
 

-(defun (setf object-arg) (value object name)
-  (with-gc-disabled
-    (let ((arg (arg-new 0)))
-      (setf (arg-name arg) name)
-      (object-get-arg object arg)
-      (let* ((type-number (arg-type arg))
-            (type (type-from-number type-number)))
-       (%arg-reset arg)
-       (setf (arg-type arg) type-number)
-       (setf (arg-value arg type) value)
-       (object-set-arg object arg)
-       (arg-free arg t))))
-  value)
-
-
-
-;;;; Main loop, timeouts and idle functions
-
-(declaim (inline events-pending-p main-iteration))
-
-(define-foreign ("gtk_events_pending" events-pending-p) () boolean)
-
-(define-foreign get-current-event () gdk:event)
-
-(define-foreign main-do-event () nil
+(defbinding main-do-event () nil

   (event gdk:event))
 
   (event gdk:event))
 

-(define-foreign main () nil)
+(defbinding main () nil)

 
 

-(define-foreign main-level () int)
+(defbinding main-level () int)

 
 

-(define-foreign main-quit () nil)
+(defbinding main-quit () nil)

 
 

-(define-foreign
-    ("gtk_main_iteration_do" main-iteration) (&optional (blocking t)) boolean
+(defbinding main-iteration-do (&optional (blocking t)) boolean

   (blocking boolean))
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))
   (blocking boolean))
 
 (defun main-iterate-all (&rest args)
   (declare (ignore args))

-  (when (events-pending-p)
-    (main-iteration nil)
-    (main-iterate-all)))
-
-(define-foreign ("gtk_timeout_add_full" timeout-add)
-    (interval function) unsigned-int
-  (interval (unsigned 32))
-  (0 unsigned-long)
-  (*callback-marshal* pointer)
-  ((register-callback-function function) unsigned-long)
-  (*destroy-marshal* pointer))
-
-(define-foreign timeout-remove () nil
-  (timeout-handler-id unsigned-int))
-  
-(define-foreign ("gtk_idle_add_full" idle-add)
-    (function &optional (priority 200)) unsigned-int
-  (priority int)
-  (0 unsigned-long)
-  (*callback-marshal* pointer)
-  ((register-callback-function function) unsigned-long)
-  (*destroy-marshal* pointer))
-
-(define-foreign idle-remove () nil
-  (idle-handler-id unsigned-int))
+  (loop
+   while (events-pending-p)
+   do (main-iteration-do nil))
+  #+clisp 0)

 
 
 
 

-(system:add-fd-handler (gdk:event-poll-fd) :input #'main-iterate-all)
-(setq lisp::*periodic-polling-function* #'main-iterate-all)
-(setq lisp::*max-event-to-sec* 0)
-(setq lisp::*max-event-to-usec* 1000)
-
-
-
-;;;; Metaclass used for subclasses of object
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass object-class (gobject-class))
-
-  (defclass direct-object-slot-definition (direct-virtual-slot-definition))
-
-  (defclass effective-object-slot-definition
-    (effective-virtual-slot-definition)))
-
-
-(defmethod initialize-instance :after ((slotd direct-object-slot-definition)
-                                  &rest initargs &key)
-  (declare (ignore initargs))
-  (unless (slot-boundp slotd 'location)
-    (with-slots (pcl::name location pcl::class) slotd
-      (setf
-       location 
-       (format nil "~A::~A"
-        (alien-type-name (class-name pcl::class))
-       (name-to-string pcl::name))))))
-
-
-(defmethod direct-slot-definition-class ((class object-class) initargs)
-  (case (getf initargs :allocation)
-    (:arg (find-class 'direct-object-slot-definition))
-    (t (call-next-method))))
-
-
-(defmethod effective-slot-definition-class ((class object-class) initargs)
-  (case (getf initargs :allocation)
-    (:arg (find-class 'effective-object-slot-definition))
-    (t (call-next-method))))
-  
-
-(defmethod compute-virtual-slot-location
-    ((class object-class) (slotd effective-object-slot-definition)
-     direct-slotds)
-  (with-slots (type) slotd
-    (let ((location (slot-definition-location (first direct-slotds)))
-         (type-number (find-type-number type))
-         (reader (get-reader-function type))
-         (writer (get-writer-function type))
-         (destroy (get-destroy-function type)))
-      (list
-       #'(lambda (object)
-          (with-gc-disabled
-            (let ((arg (arg-new type-number)))
-              (setf (arg-name arg) location)
-              (object-get-arg object arg)
-              (prog1
-                  (funcall reader arg +arg-value-offset+)
-                (arg-free arg t t)))))
-       #'(lambda (value object)
-          (with-gc-disabled
-            (let ((arg (arg-new type-number)))
-              (setf (arg-name arg) location)
-              (funcall writer value arg +arg-value-offset+)
-              (object-set-arg object arg)
-              (funcall destroy arg +arg-value-offset+)
-              (arg-free arg nil)
-              value)))))))
-
-
-(defmethod validate-superclass ((class object-class)
-                               (super pcl::standard-class))
-  (subtypep (class-name super) 'object))
-  
-
-;;;; Metaclasses used for widgets and containers
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass widget-class (object-class))
-
-  (defclass container-class (widget-class)
-    (child-class)))
-
-
-(defvar *child-to-container-class-mappings* (make-hash-table))
-
-(defmethod shared-initialize ((class container-class) names
-                             &rest initargs &key name child-class)
-  (declare (ignore initargs))
-  (call-next-method)
-  (with-slots ((child-class-slot child-class)) class
-    (setf
-     child-class-slot
-     (or
-      (first child-class)
-      (intern (format nil "~A-CHILD" (or name (class-name class)))))
-     (gethash child-class-slot *child-to-container-class-mappings*)
-     class)))
-
-
-(defmethod validate-superclass ((class widget-class)
-                               (super pcl::standard-class))
-  (subtypep (class-name super) 'widget))
-
-(defmethod validate-superclass ((class container-class)
-                               (super pcl::standard-class))
-  (subtypep (class-name super) 'container))
+(define-callback fd-source-callback-marshal nil 
+    ((callback-id unsigned-int) (fd unsigned-int))
+  (glib::invoke-source-callback callback-id fd))

 
 

+(defbinding (input-add "gtk_input_add_full") (fd condition function) unsigned-int
+  (fd unsigned-int)
+  (condition gdk:input-condition)
+  (fd-source-callback-marshal callback)
+  (nil null)
+  ((register-callback-function function) unsigned-long)
+  (user-data-destroy-callback callback))

 
 
 ;;;; Metaclass for child classes
 
 
 ;;;; Metaclass for child classes

+ 
+(defvar *container-to-child-class-mappings* (make-hash-table))

 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass child-class (virtual-class))
+  (defclass container-child-class (virtual-slots-class)
+    ())

 
 

-  (defclass direct-child-slot-definition (direct-virtual-slot-definition))
+  (defclass direct-child-slot-definition (direct-virtual-slot-definition)
+    ((pname :reader slot-definition-pname :initarg :pname)))

 
 

-  (defclass effective-child-slot-definition
-    (effective-virtual-slot-definition)))
+  (defclass effective-child-slot-definition (effective-virtual-slot-definition)
+    ((pname :reader slot-definition-pname :initarg :pname))))

 
 
 
 

-(defmethod initialize-instance  ((slotd direct-child-slot-definition)
-                                &rest initargs &key)
-  (declare (ignore initargs))
+(defmethod shared-initialize ((class container-child-class) names &key container)
+  (declare (ignore names))

   (call-next-method)
   (call-next-method)

-  (unless (slot-boundp slotd 'location)
-    (with-slots (pcl::name location pcl::class) slotd
-      (setf
-       location 
-       (format nil "~A::~A"
-        (alien-type-name
-        (gethash (class-name pcl::class) *child-to-container-class-mappings*))
-       (name-to-string pcl::name))))))
-
-
-(defmethod direct-slot-definition-class ((class child-class) initargs)
+  (setf
+   (gethash (find-class (first container)) *container-to-child-class-mappings*)
+    class)
+  #+clisp
+  (loop
+   for slotd in (class-direct-slots class)
+   when (typep slotd 'direct-child-slot-definition)
+   do (loop
+       for reader in (slot-definition-readers slotd)
+       do (add-reader-method class 
+          (ensure-generic-function reader :lambda-list '(object)) 
+          (slot-definition-name slotd)))
+      (loop
+       for writer in (slot-definition-writers slotd)
+       do (add-writer-method class 
+          (ensure-generic-function writer :lambda-list '(value object)) 
+          (slot-definition-name slotd)))))
+
+(defmethod direct-slot-definition-class ((class container-child-class) &rest initargs)

   (case (getf initargs :allocation)
   (case (getf initargs :allocation)

-    (:arg (find-class 'direct-child-slot-definition))
+    (:property (find-class 'direct-child-slot-definition))

     (t (call-next-method))))
 
     (t (call-next-method))))
 

-
-(defmethod effective-slot-definition-class ((class child-class) initargs)
+(defmethod effective-slot-definition-class ((class container-child-class) &rest initargs)

   (case (getf initargs :allocation)
   (case (getf initargs :allocation)

-    (:arg (find-class 'effective-child-slot-definition))
+    (:property (find-class 'effective-child-slot-definition))

     (t (call-next-method))))
     (t (call-next-method))))

-  
-
-(defmethod compute-virtual-slot-location
-    ((class child-class) (slotd effective-child-slot-definition) direct-slotds)
-  (with-slots (type) slotd
-    (let ((location (slot-definition-location (first direct-slotds)))
-         (type-number (find-type-number type))
-         (reader (get-reader-function type))
-         (writer (get-writer-function type))
-         (destroy (get-destroy-function type)))
-      (list
-       #'(lambda (object)
-          (with-slots (parent child) object       
-            (with-gc-disabled
-              (let ((arg (arg-new type-number)))
-                (setf (arg-name arg) location)
-                (container-child-get-arg parent child arg)
-                (prog1
-                    (funcall reader arg +arg-value-offset+)
-                  (arg-free arg t t))))))
-       #'(lambda (value object)
-          (with-slots (parent child) object       
-            (with-gc-disabled
-              (let ((arg (arg-new type-number)))
-                (setf (arg-name arg) location)
-                (funcall writer value arg +arg-value-offset+)
-                (container-child-set-arg parent child arg)
-                (funcall destroy arg +arg-value-offset+)
-                (arg-free arg nil)
-                value))))))))
-
-
-(defmethod pcl::add-reader-method ((class child-class) generic-function slot-name)
+
+(defmethod compute-effective-slot-definition-initargs ((class container-child-class) direct-slotds)
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
+      (nconc 
+       (list :pname (most-specific-slot-value direct-slotds 'pname))
+       (call-next-method))
+    (call-next-method)))
+
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
+  (let* ((type (slot-definition-type slotd))
+        (pname (slot-definition-pname slotd))
+        (reader (reader-function type :ref :get)))
+    #'(lambda (object)
+       (with-slots (parent child) object          
+         (with-memory (gvalue +gvalue-size+)
+           (glib::%gvalue-init gvalue (find-type-number type))
+           (%container-child-get-property parent child pname gvalue)
+           (funcall reader gvalue +gvalue-value-offset+))))))
+
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
+  (let* ((type (slot-definition-type slotd))
+        (pname (slot-definition-pname slotd))
+        (writer (writer-function type :temp t))
+        (destroy (destroy-function type :temp t)))
+    #'(lambda (value object)
+       (with-slots (parent child) object          
+         (with-memory (gvalue +gvalue-size+)
+           (glib::%gvalue-init gvalue (find-type-number type))
+           (funcall writer value gvalue +gvalue-value-offset+)
+           (%container-child-set-property parent child pname gvalue)
+           (funcall destroy gvalue +gvalue-value-offset+))
+         value))))
+
+
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)

   (add-method
    generic-function
    (make-instance 'standard-method
   (add-method
    generic-function
    (make-instance 'standard-method

-                 :specializers (list (find-class 'widget))
-                 :lambda-list '(widget)
-                 :function #'(lambda (args next-methods)
-                               (declare (ignore next-methods))
-                               (child-slot-value (first args) slot-name)))))
-
-(defmethod pcl::add-writer-method
-    ((class child-class) generic-function slot-name)
+    :specializers (list (find-class 'widget))
+    :lambda-list '(widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
+    :function #'(lambda (args next-methods)
+                 (declare (ignore next-methods))
+                 (child-property-value (first args) slot-name)))))
+
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)

   (add-method
    generic-function
    (make-instance 'standard-method
   (add-method
    generic-function
    (make-instance 'standard-method

-                 :specializers (list (find-class t) (find-class 'widget))
-                 :lambda-list '(value widget)
-                 :function #'(lambda (args next-methods)
-                               (declare (ignore next-methods))
-                               (destructuring-bind (value widget) args
-                                 (setf
-                                  (child-slot-value widget slot-name)
-                                  value))))))
-
-
-(defmethod validate-superclass ((class child-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'container-child))
-
-
+    :specializers (list (find-class t) (find-class 'widget))
+    :lambda-list '(value widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
+    :function #'(lambda (args next-methods)
+                 (declare (ignore next-methods))
+                 (destructuring-bind (value widget) args
+                   (setf (child-property-value widget slot-name) value))))))
+
+
+(defmethod validate-superclass ((class container-child-class) (super standard-class))
+  ;(subtypep (class-name super) 'container-child)
+  t)
+
+
+(defclass container-child (virtual-slots-object)
+  ((parent :initarg :parent :type container)
+   (child :initarg :child :type widget)))
+
+
+;;;;
+
+(defbinding %container-class-list-child-properties () pointer
+  (class pointer)
+  (n-properties unsigned-int :out))
+
+(defun query-container-class-child-properties (type-number)
+  (let ((class (type-class-ref type-number)))
+    (multiple-value-bind (array length)
+       (%container-class-list-child-properties class)
+      (unwind-protect
+         (map-c-vector 'list #'identity array 'param length)
+       (deallocate-memory array)))))
+
+(defun default-container-child-name (container-class)
+  (intern (format nil "~A-CHILD" container-class)))
+
+(defun expand-container-type (type forward-p options)
+  (let* ((class (type-from-number type))
+        (super (supertype type))
+        (child-class (default-container-child-name class)))
+    (if forward-p 
+       (expand-gobject-type type t options)
+      `(progn
+        ,(expand-gobject-type type nil options)
+        (defclass ,child-class (,(default-container-child-name super))
+          ,(slot-definitions child-class 
+            (query-container-class-child-properties type) nil)
+          (:metaclass container-child-class)
+          (:container ,class))))))
+
+(defun container-child-class (container-class)
+  (gethash container-class *container-to-child-class-mappings*))
+
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)