;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2000 Espen S. Johnsen <esj@ostud.cs.uit.no>
+;; Copyright (C) 1999-2001 Espen S. Johnsen <espen@users.sourceforge.org>
;;
;; This library is free software; you can redistribute it and/or
;; modify it under the terms 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
-;; $Id: gtkobject.lisp,v 1.7 2000/11/09 20:30:16 espen Exp $
+;; $Id: gtkobject.lisp,v 1.12 2001/11/12 22:33:08 espen Exp $
(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+))
+; (defun name-to-string (name)
+; (substitute #\_ #\- (string-downcase (string name))))
-;; 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 string-to-name (name &optional (package "KEYWORD"))
+; (intern (substitute #\- #\_ (string-upcase name)) package))
-(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)
- (defclass object (gobject)
+ (init-types-in-library "libgtk-x11-1.3.so"
+ :ignore ("gtk_window_get_type_hint"))
+
+ (defclass %object (gobject)
()
-; ((flags
-; :allocation :alien
-; :accessor object-flags
-; :type object-flags))
(:metaclass gobject-class)
(:alien-name "GtkObject")))
-(defmethod shared-initialize ((object object) names &rest initargs &key signals)
- (declare (ignore initargs names))
+(defmethod shared-initialize ((object %object) names &rest initargs
+ &allow-other-keys)
+ (declare (ignore names))
(call-next-method)
- (dolist (signal signals)
- (apply #'signal-connect object signal)))
-
-
-(defmethod initialize-instance :after ((object object) &rest initargs &key)
- (declare (ignore initargs))
- (object-default-construct object)
- (reference-instance object)
- (object-sink object))
-
+ (funcall (proxy-class-copy (class-of object)) nil (proxy-location object)) ; inc ref count before sinking
+ (%object-sink object)
+ (dolist (signal-definition (get-all initargs :signal))
+ (apply #'signal-connect object signal-definition)))
-(defmethod from-alien-initialzie-instance ((object object) &rest initargs)
+(defmethod initialize-proxy ((object %object) &rest initargs)
(declare (ignore initargs))
(call-next-method)
- (object-sink object))
-
-
-(define-foreign object-default-construct () nil
- (object object))
-
-(define-foreign object-sink () nil
- (object object))
-
-(define-foreign ("gtk_object_getv" object-get-arg) () nil
- (object object)
- (1 unsigned-int)
- (arg arg))
-
-(define-foreign ("gtk_object_setv" object-set-arg) () nil
- (object object)
- (1 unsigned-int)
- (arg arg))
-
-(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))))))
-
-(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)
+ (%object-sink object))
+(defbinding %object-sink () nil
+ (object %object))
;;;; Main loop, timeouts and idle functions
(declaim (inline events-pending-p main-iteration))
-(define-foreign ("gtk_events_pending" events-pending-p) () boolean)
+(defbinding (events-pending-p "gtk_events_pending") () boolean)
-(define-foreign get-current-event () gdk:event)
+(defbinding get-current-event () gdk:event)
-(define-foreign main-do-event () nil
+(defbinding main-do-event () nil
(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))
(when (events-pending-p)
- (main-iteration nil)
+ (main-iteration-do 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))
-
-
-(system:add-fd-handler (gdk:event-poll-fd) :input #'main-iterate-all)
+(system:add-fd-handler (gdk:connection-number) :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
+;;;; Metaclass for child classes
+
+(defvar *container-to-child-class-mappings* (make-hash-table))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass object-class (gobject-class))
+ (defclass child-class (virtual-slot-class))
- (defclass direct-object-slot-definition (direct-virtual-slot-definition))
+ (defclass direct-child-slot-definition (direct-virtual-slot-definition)
+ ((pname :reader slot-definition-pname)))
- (defclass effective-object-slot-definition
+ (defclass effective-child-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)
+(defmethod shared-initialize ((class child-class) names &rest initargs
+ &key container)
(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))
-
-
-
-;;;; Metaclass for child classes
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass child-class (virtual-class))
-
- (defclass direct-child-slot-definition (direct-virtual-slot-definition))
-
- (defclass effective-child-slot-definition
- (effective-virtual-slot-definition)))
-
+ (setf
+ (gethash (find-class (first container)) *container-to-child-class-mappings*)
+ class))
(defmethod initialize-instance ((slotd direct-child-slot-definition)
- &rest initargs &key)
+ &rest initargs &key pname)
(declare (ignore initargs))
(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))))))
-
+ (if pname
+ (setf (slot-value slotd 'pname) pname)
+ ; ???
+ (error "Need pname for slot with allocation :property")))
(defmethod direct-slot-definition-class ((class child-class) initargs)
(case (getf initargs :allocation)
- (:arg (find-class 'direct-child-slot-definition))
+ (:property (find-class 'direct-child-slot-definition))
(t (call-next-method))))
-
(defmethod effective-slot-definition-class ((class child-class) initargs)
(case (getf initargs :allocation)
- (:arg (find-class 'effective-child-slot-definition))
+ (:property (find-class 'effective-child-slot-definition))
(t (call-next-method))))
-
-(defmethod compute-virtual-slot-location
+(defmethod compute-virtual-slot-accessors
((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)))
+ (let ((pname (slot-definition-pname (first direct-slotds)))
+ (type-number (find-type-number 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))))))
+ (let ((gvalue (gvalue-new type-number)))
+ (%container-child-get-property parent child pname gvalue)
+ (unwind-protect
+ (funcall
+ (intern-reader-function type)
+ gvalue +gvalue-value-offset+)
+ (gvalue-free gvalue 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))))))))
+ (let ((gvalue (gvalue-new type-number)))
+ (funcall
+ (intern-writer-function type)
+ value gvalue +gvalue-value-offset+)
+ (%container-child-set-property parent child pname gvalue)
+ (funcall
+ (intern-destroy-function type)
+ gvalue +gvalue-value-offset+)
+ (gvalue-free gvalue nil)
+ value))))))))
(defmethod pcl::add-reader-method ((class child-class) generic-function slot-name)
(defmethod validate-superclass ((class child-class) (super pcl::standard-class))
- (subtypep (class-name super) 'container-child))
-
-
+ ;(subtypep (class-name super) 'container-child)
+ t)
+
+
+(defclass container-child ()
+ ((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-array '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-number &optional slots)
+ (let* ((class (type-from-number type-number))
+ (super (supertype type-number))
+ (child-class (default-container-child-name class))
+ (expanded-child-slots
+ (mapcar
+ #'(lambda (param)
+ (with-slots (name flags value-type documentation) param
+ (let* ((slot-name (default-slot-name name))
+ (slot-type (type-from-number value-type #|t|#))
+ (accessor
+ (default-slot-accessor class slot-name slot-type)))
+ `(,slot-name
+ :allocation :property
+ :pname ,name
+ ,@(cond
+ ((and
+ (member :writable flags)
+ (member :readable flags))
+ (list :accessor accessor))
+ ((member :writable flags)
+ (list :writer `(setf ,accessor)))
+ ((member :readable flags)
+ (list :reader accessor)))
+ ,@(when (or
+ (member :construct flags)
+ (member :writable flags))
+ (list :initarg (intern (string slot-name) "KEYWORD")))
+ :type ,slot-type
+ ,@(when documentation
+ (list :documentation documentation))))))
+ (query-container-class-child-properties type-number))))
+ `(progn
+ ,(expand-gobject-type type-number slots)
+ (defclass ,child-class
+ (,(default-container-child-name super))
+ ,expanded-child-slots
+ (:metaclass child-class)
+ (:container ,class)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type)
~mdw / clg / blobdiff