X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/75689fea8b73ccc1e8cb32b671b7fd881da40cf3..dd70f526c9e295c511e3031c7a203057825bb88f:/glib/gerror.lisp?ds=sidebyside

diff --git a/glib/gerror.lisp b/glib/gerror.lisp
index 5e0f56d..d3be6f5 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,16 +20,24 @@
 ;; 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.5 2006-02-26 15:30:01 espen Exp $
+;; $Id: gerror.lisp,v 1.11 2008-12-10 02:49:17 espen Exp $
 
 
 (in-package "GLIB")
 
-(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))
+(define-enum-type file-error-enum
+  :exist :isdir :acces :name-too-long :noent :notdir :nxio :nodev :rofs :txtbsy
+  :fault :loop :nospc :nomem :mfile :nfile :badf :inval :pipe :again :intr
+  :io :perm :nosys :failed)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (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)
+    (:ref %gerror-copy)
+    (:unref %gerror-free)))
 
 (defbinding (%gerror-copy "g_error_copy") () pointer
   (location pointer))
@@ -37,17 +45,21 @@ (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))
+(defbinding (gerror-new "g_error_new_literal") 
+    (domain code format &rest args) gerror
+  (domain quark)
+  (code int)
+  ((apply #'format nil format args) string))
 
+(defbinding (gerror-set "g_set_error_literal") 
+    (gerror domain code format &rest args) nil
+  gerror
+  (domain quark)
+  (code int)
+  ((apply #'format nil format args) string))
 
 (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))))
@@ -55,21 +67,37 @@ (define-condition glib-error (error)
 (define-condition glib-file-error (glib-error)
   ())
 
-(defbinding file-error-quark () quark)
+(defbinding (file-error-domain "g_file_error_quark") () quark)
 
 (defun signal-gerror (gerror)
   (let ((condition
 	 (cond
-	  ((= (gerror-domain gerror) (file-error-quark)) 'glib-file-error)
+	  ((= (gerror-domain gerror) (file-error-domain)) 'glib-file-error)
 	  (t 'glib-error))))
     (error condition :code (gerror-code gerror) :message (gerror-message gerror))))
 
+;; This temporary hack is necessary until define-callback gets support
+;; for :in/out parameters
+(defun gerror-set-in-callback (indirect-location domain code format &rest args)
+  (unless (null-pointer-p indirect-location)
+    (if (null-pointer-p (ref-pointer indirect-location))
+	(setf (ref-pointer indirect-location) 
+	 (funcall (to-alien-function 'gerror) 
+	  (apply #'gerror-new domain code format args)))
+      (let ((gerror (funcall (from-alien-function '(static gerror)) 
+		     (ref-pointer indirect-location))))
+	(apply #'gerror-set gerror domain code format args)))))
+
 
 (deftype gerror-signal () 'gerror)
 
-(define-type-method from-alien-form ((type gerror-signal) gerror)
+(define-type-method return-type ((type gerror-signal))
   (declare (ignore type))
-  `(let ((gerror ,(from-alien-form 'gerror gerror)))
+  '(or null 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 +135,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)
   ())
 
@@ -130,18 +161,21 @@ (define-callback log-handler nil
     (funcall (if fatal-p #'error #'warn) condition
      :domain domain :message message)))
 
-(setf (extern-alien "log_handler" system-area-pointer) 
+#-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
-    ((progn log-handler) callback)
+  (defbinding %log-set-default-handler (nil) pointer
+    (log-handler callback)
     (nil null))
   (%log-set-default-handler))