X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/e0d2987b2876e68b8d1052600c3f2281b5b60ec6..89b927eccccca3e1ed0c8f154399e0f385276215:/glib/gcallback.lisp diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index f2fc311..e8d7ca4 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.17 2005-01-03 16:37:16 espen Exp $ +;; $Id: gcallback.lisp,v 1.26 2006-02-01 14:18:49 espen Exp $ (in-package "GLIB") @@ -28,9 +33,6 @@ (check-type function (or null symbol function)) (register-user-data function)) -(defcallback %destroy-user-data (nil (id unsigned-int)) - (destroy-user-data id)) - ;; Callback marshal for regular signal handlers (defcallback closure-marshal (nil (gclosure pointer) @@ -39,6 +41,7 @@ (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 @@ -92,7 +95,7 @@ (interval unsigned-int) ((callback source-callback-marshal) pointer) ((register-callback-function function) unsigned-long) - ((callback %destroy-user-data) pointer)) + ((callback user-data-destroy-func) pointer)) (defun timeout-remove (timeout) (source-remove timeout)) @@ -102,7 +105,7 @@ (priority int) ((callback source-callback-marshal) pointer) ((register-callback-function function) unsigned-long) - ((callback %destroy-user-data) pointer)) + ((callback user-data-destroy-func) pointer)) (defun idle-remove (idle) (source-remove idle)) @@ -183,6 +186,79 @@ ;;;; 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 defaults return-type) + (let ((params (allocate-memory (* n-params +gvalue-size+)))) + (loop + as tmp = args then (rest tmp) + for default in defaults + for type in types + for offset from 0 by +gvalue-size+ + as arg = (if tmp (car tmp) default) + do (gvalue-init (sap+ 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 (sap+ 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"))) + + `(progn + (signal-override-class-closure ',name ',class + #'(lambda (,object ,@args) + (flet ((call-next-handler (&rest ,next) + (let ((defaults (list* ,object ,@vars ,rest))) + (%call-next-handler + ,n-params ',types ,next defaults ',return-type)))) + ,@body))) + ',name))) + + (defbinding %signal-stop-emission () nil (instance ginstance) (signal-id unsigned-int) @@ -203,7 +279,7 @@ (detail quark) ((callback signal-emission-hook) pointer) ((register-callback-function function) unsigned-int) - ((callback %destroy-user-data) pointer)) + ((callback user-data-destroy-func) pointer)) (defbinding signal-remove-emission-hook (type signal hook-id) nil ((ensure-signal-id-from-type signal type) unsigned-int) @@ -215,7 +291,7 @@ (instance ginstance) ((ensure-signal-id signal-id instance) unsigned-int) ((or detail 0) quark) - (may-be-blocked boolean)) + (blocked boolean)) (defbinding %signal-connect-closure-by-id () unsigned-int (instance ginstance) @@ -240,7 +316,10 @@ (instance ginstance) (handler-id unsigned-int)) -(defbinding (callback-closure-new "clg_callback_closure_new") () pointer +(deftype gclosure () 'pointer) +(register-type 'gclosure "GClosure") + +(defbinding (callback-closure-new "clg_callback_closure_new") () gclosure (callback-id unsigned-int) (callback pointer) (destroy-notify pointer)) @@ -250,19 +329,37 @@ (values (callback-closure-new callback-id (callback closure-marshal) - (callback %destroy-user-data)) + (callback user-data-destroy-func)) callback-id))) -(defmethod create-callback-function ((gobject gobject) function arg1) +(defgeneric compute-signal-function (gobject signal function object)) + +(defmethod compute-signal-function ((gobject gobject) signal function object) + (declare (ignore signal)) (cond - ((or (eq arg1 t) (eq arg1 gobject)) function) - ((not arg1) + ((or (eq object t) (eq object gobject)) function) + ((not object) #'(lambda (&rest args) (apply function (rest args)))) (t - #'(lambda (&rest args) (apply function arg1 (rest args)))))) + #'(lambda (&rest args) (apply function object (rest args)))))) + + +(defgeneric compute-signal-id (gobject signal)) + +(defmethod compute-signal-id ((gobject gobject) signal) + (ensure-signal-id signal gobject)) + + +(defgeneric signal-connect (gobject signal function &key detail after object remove)) + +(defmethod signal-connect :around ((gobject gobject) signal function &rest args) + (declare (ignore gobject signal args)) + (when function + (call-next-method))) + (defmethod signal-connect ((gobject gobject) signal function - &key (detail 0) after object remove) + &key detail after object remove) "Connects a callback function to a signal for a particular object. If :OBJECT is T, the object connected to is passed as the first argument to the callback function, or if :OBJECT is any other non NIL value, it @@ -270,19 +367,19 @@ is passed as the first argument instead. If :AFTER is non NIL, the handler will be called after the default handler for the signal. If :REMOVE is non NIL, the handler will be removed after beeing invoked once." - (when function - (let* ((signal-id (ensure-signal-id signal gobject)) - (signal-stop-emission - #'(lambda () - (%signal-stop-emission gobject signal-id detail))) - (callback (create-callback-function gobject function object)) - (wrapper #'(lambda (&rest args) - (let ((*signal-stop-emission* signal-stop-emission)) - (apply callback args))))) +(let* ((signal-id (compute-signal-id gobject signal)) + (detail-quark (if detail (quark-intern detail) 0)) + (signal-stop-emission + #'(lambda () + (%signal-stop-emission gobject signal-id detail-quark))) + (callback (compute-signal-function gobject signal function object)) + (wrapper #'(lambda (&rest args) + (let ((*signal-stop-emission* signal-stop-emission)) + (apply callback args))))) (multiple-value-bind (closure-id callback-id) (make-callback-closure wrapper) (let ((handler-id (%signal-connect-closure-by-id - gobject signal-id detail closure-id after))) + gobject signal-id detail-quark closure-id after))) (when remove (update-user-data callback-id #'(lambda (&rest args) @@ -290,7 +387,7 @@ once." (let ((*signal-stop-emission* signal-stop-emission)) (apply callback args)) (signal-handler-disconnect gobject handler-id))))) - handler-id))))) + handler-id)))) ;;;; Signal emission @@ -344,19 +441,6 @@ once." (apply #'signal-emit-with-detail object signal 0 args)) - -;;; Message logging - -;; TODO: define and signal conditions based on log-level - -(def-callback log-handler (c-call:void (domain c-call:c-string) - (log-level c-call:int) - (message c-call:c-string)) - (error "~A: ~A" domain message)) - -(setf (extern-alien "log_handler" system-area-pointer) (callback log-handler)) - - ;;;; Convenient macros (defmacro def-callback-marshal (name (return-type &rest args))