X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/cd9b9e8bad103a9ebfb891bf5a06407faa096249..fa30048e45d3d71f09ac0b963f7cc7d1c7769475:/glib/gcallback.lisp diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index e2ae74d..6fdf198 100644 --- a/glib/gcallback.lisp +++ b/glib/gcallback.lisp @@ -1,21 +1,26 @@ -;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2000 Espen S. Johnsen +;; Common Lisp bindings for GTK+ v2.x +;; Copyright 2000 Espen S. Johnsen ;; -;; 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: gcallback.lisp,v 1.22 2005-02-22 17:29:38 espen Exp $ +;; $Id: gcallback.lisp,v 1.34 2006-04-25 21:57:44 espen Exp $ (in-package "GLIB") @@ -24,26 +29,26 @@ ;;;; Callback invokation +(deftype gclosure () 'pointer) +(register-type 'gclosure '|g_closure_get_type|) + (defun register-callback-function (function) (check-type function (or null symbol function)) (register-user-data function)) ;; Callback marshal for regular signal handlers -(defcallback closure-marshal (nil - (gclosure pointer) - (return-value gvalue) - (n-params unsigned-int) - (param-values pointer) - (invocation-hint pointer) - (callback-id unsigned-int)) +(define-callback closure-marshal nil + ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) + (param-values pointer) (invocation-hint pointer) + (callback-id unsigned-int)) + (declare (ignore gclosure invocation-hint)) (callback-trampoline callback-id n-params param-values return-value)) ;; Callback function for emission hooks -(defcallback signal-emission-hook (nil - (invocation-hint pointer) - (n-params unsigned-int) - (param-values pointer) - (callback-id unsigned-int)) +(define-callback signal-emission-hook nil + ((invocation-hint pointer) (n-params unsigned-int) (param-values pointer) + (callback-id unsigned-int)) + (declare (ignore invocation-hint)) (callback-trampoline callback-id n-params param-values)) (defun callback-trampoline (callback-id n-params param-values &optional @@ -52,10 +57,19 @@ (gvalue-type return-value))) (args (loop for n from 0 below n-params - collect (gvalue-get (sap+ param-values (* n +gvalue-size+)))))) - (let ((result (apply #'invoke-callback callback-id return-type args))) - (when return-type - (gvalue-set return-value result))))) + for offset from 0 by +gvalue-size+ + collect (gvalue-peek (pointer+ param-values offset))))) + (unwind-protect + (let ((result (apply #'invoke-callback callback-id return-type args))) + (when return-type + (gvalue-set return-value result))) + ;; TODO: this should be made more general, by adding a type + ;; method to return invalidate functions. + (loop + for arg in args + when (typep arg 'struct) + do (invalidate-instance arg))))) + (defun invoke-callback (callback-id return-type &rest args) (restart-case @@ -80,16 +94,16 @@ (defbinding source-remove () boolean (tag unsigned-int)) -(defcallback source-callback-marshal (nil (callback-id unsigned-int)) +(define-callback source-callback-marshal nil ((callback-id unsigned-int)) (callback-trampoline callback-id 0 nil)) (defbinding (timeout-add "g_timeout_add_full") (interval function &optional (priority +priority-default+)) unsigned-int (priority int) (interval unsigned-int) - ((callback source-callback-marshal) pointer) + (source-callback-marshal callback) ((register-callback-function function) unsigned-long) - ((callback user-data-destroy-func) pointer)) + (user-data-destroy-callback callback)) (defun timeout-remove (timeout) (source-remove timeout)) @@ -97,9 +111,9 @@ (defbinding (idle-add "g_idle_add_full") (function &optional (priority +priority-default-idle+)) unsigned-int (priority int) - ((callback source-callback-marshal) pointer) + (source-callback-marshal callback) ((register-callback-function function) unsigned-long) - ((callback user-data-destroy-func) pointer)) + (user-data-destroy-callback callback)) (defun idle-remove (idle) (source-remove idle)) @@ -153,7 +167,7 @@ (defbinding signal-query (signal-id &optional (signal-query (make-instance 'signal-query))) nil (signal-id unsigned-int) - (signal-query signal-query :return)) + (signal-query signal-query :in/return)) (defun signal-param-types (info) (with-slots (n-params param-types) info @@ -180,6 +194,78 @@ ;;;; Signal connecting and controlling +(defvar *overridden-signals* (make-hash-table :test 'equalp)) + +(defbinding %signal-override-class-closure () nil + (signal-id unsigned-int) + (type-number type-number) + (callback-closure pointer)) + + +(defun signal-override-class-closure (name type function) + (let* ((signal-id (ensure-signal-id-from-type name type)) + (type-number (find-type-number type t)) + (callback-id (gethash (cons type-number signal-id) *overridden-signals*))) + (if callback-id + (update-user-data callback-id function) + (multiple-value-bind (callback-closure callback-id) + (make-callback-closure function) + (%signal-override-class-closure signal-id type-number callback-closure) + (setf + (gethash (cons type-number signal-id) *overridden-signals*) + callback-id))))) + + +(defbinding %signal-chain-from-overridden () nil + (args pointer) + (return-value (or null gvalue))) + + +(defun %call-next-handler (n-params types args return-type) + (let ((params (allocate-memory (* n-params +gvalue-size+)))) + (loop + for arg in args + for type in types + for offset from 0 by +gvalue-size+ + do (gvalue-init (pointer+ params offset) type arg)) + + (unwind-protect + (if return-type + (with-gvalue (return-value return-type) + (%signal-chain-from-overridden params return-value)) + (%signal-chain-from-overridden params nil)) + (progn + (loop + repeat n-params + for offset from 0 by +gvalue-size+ + do (gvalue-unset (pointer+ params offset))) + (deallocate-memory params))))) + + +(defmacro define-signal-handler (name ((object class) &rest args) &body body) + (let* ((info (signal-query (ensure-signal-id-from-type name class))) + (types (cons class (signal-param-types info))) + (n-params (1+ (slot-value info 'n-params))) + (return-type (type-from-number (slot-value info 'return-type))) + (vars (loop + for arg in args + until (eq arg '&rest) + collect arg)) + (rest (cadr (member '&rest args))) + (next (make-symbol "ARGS")) + (default (make-symbol "DEFAULT"))) + + `(progn + (signal-override-class-closure ',name ',class + #'(lambda (,object ,@args) + (let ((,default (list* ,object ,@vars ,rest))) + (flet ((call-next-handler (&rest ,next) + (%call-next-handler + ,n-params ',types (or ,next ,default) ',return-type)))) + ,@body))) + ',name))) + + (defbinding %signal-stop-emission () nil (instance ginstance) (signal-id unsigned-int) @@ -198,9 +284,9 @@ unsigned-int ((ensure-signal-id-from-type signal type) unsigned-int) (detail quark) - ((callback signal-emission-hook) pointer) + (signal-emission-hook callback) ((register-callback-function function) unsigned-int) - ((callback user-data-destroy-func) pointer)) + (user-data-destroy-callback callback)) (defbinding signal-remove-emission-hook (type signal hook-id) nil ((ensure-signal-id-from-type signal type) unsigned-int) @@ -237,19 +323,15 @@ (instance ginstance) (handler-id unsigned-int)) -(deftype gclosure () 'pointer) - (defbinding (callback-closure-new "clg_callback_closure_new") () gclosure (callback-id unsigned-int) - (callback pointer) - (destroy-notify pointer)) + (callback callback) + (destroy-notify callback)) (defun make-callback-closure (function) (let ((callback-id (register-callback-function function))) (values - (callback-closure-new - callback-id (callback closure-marshal) - (callback user-data-destroy-func)) + (callback-closure-new callback-id closure-marshal user-data-destroy-callback) callback-id))) (defgeneric compute-signal-function (gobject signal function object)) @@ -334,7 +416,7 @@ once." (loop for arg in (cons object args) for type in param-types - as tmp = params then (sap+ tmp +gvalue-size+) + as tmp = params then (pointer+ tmp +gvalue-size+) do (gvalue-init tmp type arg) finally (if return-type @@ -344,7 +426,7 @@ once." (%signal-emitv params signal-id detail (make-pointer 0)))) (loop repeat n-params - as tmp = params then (sap+ tmp +gvalue-size+) + as tmp = params then (pointer+ tmp +gvalue-size+) while (gvalue-p tmp) do (gvalue-unset tmp))))))) @@ -363,16 +445,34 @@ once." ;;;; Convenient macros -(defmacro def-callback-marshal (name (return-type &rest args)) - (let ((names (loop - for arg in args - collect (if (atom arg) (gensym) (first arg)))) - (types (loop - for arg in args - collect (if (atom arg) arg (second arg))))) - `(defcallback ,name (,return-type ,@(mapcar #'list names types) - (callback-id unsigned-int)) - (invoke-callback callback-id ',return-type ,@names)))) +(defmacro define-callback-marshal (name return-type args &key (callback-id :last)) + (let* ((ignore ()) + (params ()) + (names (loop + for arg in args + collect (if (or + (eq arg :ignore) + (and (consp arg) (eq (first arg) :ignore))) + (let ((name (gensym "IGNORE"))) + (push name ignore) + name) + (let ((name (if (atom arg) + (gensym (string arg)) + (first arg)))) + (push name params) + name)))) + (types (loop + for arg in args + collect (cond + ((eq arg :ignore) 'pointer) + ((atom arg) arg) + (t (second arg)))))) + `(define-callback ,name ,return-type + ,(ecase callback-id + (:first `((callback-id unsigned-int) ,@(mapcar #'list names types))) + (:last `(,@(mapcar #'list names types) (callback-id unsigned-int)))) + (declare (ignore ,@ignore)) + (invoke-callback callback-id ',return-type ,@(nreverse params))))) (defmacro with-callback-function ((id function) &body body) `(let ((,id (register-callback-function ,function)))