X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/b4a94e209931fdae387a11090159e96e42417fee..f595e05cebd378ebe8c848edce5b5a37b34e308f:/glib/gerror.lisp

diff --git a/glib/gerror.lisp b/glib/gerror.lisp
index c8cbd23..18289d1 100644
--- a/glib/gerror.lisp
+++ b/glib/gerror.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright 2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2005-2006 Espen S. Johnsen <espen@users.sf.net>
 ;;
 ;; Permission is hereby granted, free of charge, to any person obtaining
 ;; a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gerror.lisp,v 1.3 2006-02-13 20:03:29 espen Exp $
+;; $Id: gerror.lisp,v 1.9 2007-12-29 19:21:26 espen Exp $
 
 
 (in-package "GLIB")
@@ -29,7 +29,9 @@ (defclass gerror (struct)
   ((domain :allocation :alien :type quark :reader gerror-domain)
    (code :allocation :alien :type int :reader gerror-code)
    (message :allocation :alien :type string :reader gerror-message))
-  (:metaclass struct-class))
+  (:metaclass struct-class)
+  (:ref %gerror-copy)
+  (:unref %gerror-free))
 
 (defbinding (%gerror-copy "g_error_copy") () pointer
   (location pointer))
@@ -37,17 +39,8 @@ (defbinding (%gerror-copy "g_error_copy") () pointer
 (defbinding (%gerror-free "g_error_free") () nil
   (location pointer))
 
-(defmethod reference-foreign ((class (eql (find-class 'gerror))) location)
-  (declare (ignore class))
-  (%gerror-copy location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'gerror))) location)
-  (declare (ignore class))
-  (%gerror-free location))
-
-
 (define-condition glib-error (error)
-  ((code :initarg :domain :reader gerror-code)
+  ((code :initarg :code :reader gerror-code)
    (message :initarg :message :reader gerror-message))
   (:report (lambda (condition stream)
 	     (write-string (gerror-message condition) stream))))
@@ -67,9 +60,9 @@ (defun signal-gerror (gerror)
 
 (deftype gerror-signal () 'gerror)
 
-(defmethod from-alien-form (gerror (type (eql 'gerror-signal)) &rest args)
-  (declare (ignore type args))
-  `(let ((gerror ,(from-alien-form gerror 'gerror)))
+(define-type-method from-alien-form ((type gerror-signal) gerror &key (ref :free))
+  (declare (ignore type))
+  `(let ((gerror ,(from-alien-form 'gerror gerror :ref ref)))
      (when gerror
        (signal-gerror gerror))))
 
@@ -107,6 +100,9 @@ (define-condition critical-log-level (log-level)
 (define-condition warning-log-level (log-level)
   ())
 
+(define-condition message-log-level (log-level)
+  ())
+
 (define-condition info-log-level (log-level)
   ())
 
@@ -115,10 +111,8 @@ (define-condition debug-log-level (log-level)
 
 (defparameter *fatal-log-levels* '(error-log-level critical-log-level))
 
-(defcallback log-handler (nil 
-			   (domain (copy-of string))
-			   (log-level log-levels)
-			   (message (copy-of string)))
+(define-callback log-handler nil 
+    ((domain string) (log-level log-levels) (message string))
   (let ((fatal-p (or
 		  (find :fatal log-level)
 		  (some 
@@ -132,17 +126,21 @@ (defcallback log-handler (nil
     (funcall (if fatal-p #'error #'warn) condition
      :domain domain :message message)))
 
-(setf (extern-alien "log_handler" system-area-pointer) (callback log-handler))
+#-clisp
+(setf 
+ #+cmu(alien:extern-alien "log_handler" alien:system-area-pointer) 
+ #+sbcl(sb-alien:extern-alien "log_handler" sb-alien:system-area-pointer)
+ (callback-address log-handler))
 
 
-#+glib2.6
+#?(pkg-exists-p "glib-2.0" :atleast-version "2.6.0")
 (progn
   ;; Unfortunately this will only work as long as we don't abort to
   ;; toplevel from within the log handler. If we do that, the next
   ;; invocation of g_log will be handled as a recursion and cause an
   ;; abort (SIGABORT being signaled). To make things even worse, SBCL
   ;; doesn't handle SIGABRT at all.
-  (defbinding %log-set-default-handler () pointer
-    ((callback log-handler) pointer)
+  (defbinding %log-set-default-handler (nil) pointer
+    (log-handler callback)
     (nil null))
   (%log-set-default-handler))