Code to set gerrors from callbacks

[clg] / glib / gerror.lisp

diff --git a/glib/gerror.lisp b/glib/gerror.lisp
index ed2ad71c97b3d2044d6e3758f5b8deeebc5744be..d3be6f5781e54f456a502666c4ad73556a0c1633 100644 (file)
--- a/glib/gerror.lisp
+++ b/glib/gerror.lisp
@@ -1,30 +1,43 @@
 ;; Common Lisp bindings for GTK+ v2.0
 ;; Common Lisp bindings for GTK+ v2.0

-;; Copyright (C) 2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2005-2006 Espen S. Johnsen <espen@users.sf.net>

 ;;
 ;;

-;; 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: gerror.lisp,v 1.1 2005-02-14 00:39:39 espen Exp $
+;; $Id: gerror.lisp,v 1.11 2008-12-10 02:49:17 espen Exp $

 
 
 (in-package "GLIB")
 
 
 
 (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))
 
 (defbinding (%gerror-copy "g_error_copy") () pointer
   (location pointer))


@@ -32,17 +45,21 @@ (defbinding (%gerror-copy "g_error_copy") () pointer
 (defbinding (%gerror-free "g_error_free") () nil
   (location 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)
 
 (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))))
    (message :initarg :message :reader gerror-message))
   (:report (lambda (condition stream)
             (write-string (gerror-message condition) stream))))


@@ -50,16 +67,41 @@ (define-condition glib-error (error)
 (define-condition glib-file-error (glib-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
 
 (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))))
 
          (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 return-type ((type gerror-signal))
+  (declare (ignore type))
+  '(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))))
+
+ 

 ;;; Message logging
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;; Message logging
 
 (eval-when (:compile-toplevel :load-toplevel :execute)


@@ -93,6 +135,9 @@ (define-condition critical-log-level (log-level)
 (define-condition warning-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)
   ())
 
 (define-condition info-log-level (log-level)
   ())
 


@@ -101,10 +146,8 @@ (define-condition debug-log-level (log-level)
 
 (defparameter *fatal-log-levels* '(error-log-level critical-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 
   (let ((fatal-p (or
                  (find :fatal log-level)
                  (some 


@@ -118,17 +161,21 @@ (defcallback log-handler (nil
     (funcall (if fatal-p #'error #'warn) condition
      :domain domain :message message)))
 
     (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.
 (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))
     (nil null))
   (%log-set-default-handler))