Sun Mar 13 20:40:35 CET 2011 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Fix loading on OSX.

Thanks to Elliott Slaughter

Sat Apr 3 14:34:21 CEST 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Account for possible lisp-object metatype id change when loading an image.

Sat Feb 20 22:04:46 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* cleanup

Sat Feb 20 22:02:38 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Make qt:application cleanup more stable

Sat Feb 20 22:00:30 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* support all from qt:variant conversions.

Mon Feb 15 16:33:05 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Build a shared library not a module.

Fixes a build error on OS X.

Thu Feb 4 16:06:38 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Test building libclsmokeqtcore

Thu Feb 4 10:22:53 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Add qvector.cpp

Sat Jan 30 16:40:15 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Get the QList size using Lisp instead of an external C function.

Tue Jan 26 17:19:51 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Fix define-qlist-wrapper usage for other modules. (i.e. qt.gui)

Mon Jan 25 20:07:22 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Export delete-app since other modules (qt.gui) might like to add methods to it.

Mon Jan 25 19:53:36 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Use ELT instead of AREF for sequences in vector translations.

Mon Jan 25 19:45:04 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Allow other modules to define QList<Foo*> conversions.

Mon Jan 25 19:43:56 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Fix error reporting on signal-slot connection failure.

--- old-qt.core/src/application.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/application.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -57,12 +57,12 @@

(defgeneric delete-app (application)

(:method (application)

- (cxx:quit application)

- ;; Call the destructor; -> destructed callback is called,

- ;; (~QApplication() is virtual) which takes care of cleanup on the

- ;; Lisp side.

- (smoke::delete-pointer (smoke:pointer application) (class-of application))

- (setf (slot-value application 'pointer) (null-pointer))

+ (unless (null-pointer-p (smoke:pointer application))

+ (cxx:quit application)

+ ;; Call the destructor; -> destructed callback is called,

+ ;; (~QApplication() is virtual) which takes care of cleanup on the

+ ;; Lisp side.

+ (smoke::delete-pointer (smoke:pointer application) (class-of application)))

(makunbound '*app*)))

(defun kill-app ()

--- old-qt.core/src/lib/CMakeLists.txt 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/lib/CMakeLists.txt 2014-10-30 07:25:30.000000000 +0100

@@ -11,7 +11,7 @@

set(QT_SMOKE_SOURCES qt_smoke.cpp

qstring.cpp qstringlist.cpp lisp_object.cpp qlist.cpp qvector.cpp)

-add_library(clsmokeqtcore MODULE ${QT_SMOKE_SOURCES})

+add_library(clsmokeqtcore SHARED ${QT_SMOKE_SOURCES})

target_link_libraries(clsmokeqtcore ${QT_LIBRARIES})

set_target_properties(clsmokeqtcore

PROPERTIES

--- old-qt.core/src/lib/qlist.h 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/lib/qlist.h 2014-10-30 07:25:30.000000000 +0100

@@ -32,12 +32,6 @@

/** @internal

* size, free and make_list. */

#define DEFINE_QLIST_WRAPPER_ALL_PART(NAME, TYPE) \

-CL_SMOKE_QT_EXPORT int \

-cl_smoke_list_ ## NAME ## _size(const void* list) \

-{ \

- return static_cast<const QList< TYPE >*>(list)->size(); \

-} \

-\

CL_SMOKE_QT_EXPORT void \

cl_smoke_free_list_ ## NAME (void* list) \

{ \

--- old-qt.core/src/lib/qvector.cpp 1970-01-01 01:00:00.000000000 +0100

+++ new-qt.core/src/lib/qvector.cpp 2014-10-30 07:25:30.000000000 +0100

@@ -0,0 +1,27 @@

+#include "cl_smoke_qt.h"

+

+#include <QVector>

+#include <QPoint>

+

+extern "C" {

+

+/** Construct a 0 sized QVector.

+ * Since the QVectorData is QVectorData::shared_null the template type does not matter.

+ * @return A null QVector

+ */

+CL_SMOKE_QT_EXPORT void*

+cl_smoke_make_qvector()

+{

+ return new QVector<QPoint>();

+}

+

+/** Deletes a null QVector. i.e.: The QVectorData pointer is 0.

+ * @param qvector a null QVector

+ */

+CL_SMOKE_QT_EXPORT void

+cl_smoke_delete_qvector(void* qvector)

+{

+ delete static_cast<QVector<QPoint>*>(qvector);

+}

+

+} // extern "C"

--- old-qt.core/src/list.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/list.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -1,72 +1,117 @@

(in-package :cl-smoke.qt.core)

-(defmacro define-qlist-wrapper (type-name element-type &optional c-name)

- (let* ((c-name (or c-name type-name))

- (type (string-upcase c-name))

- (list-type (symbolicate 'qlist- type)))

- `(progn

- (defcfun ,(concatenate 'string "cl_smoke_list_" c-name "_size") :int

- "Returns the size of LIST."

- (list :pointer))

- (defcfun ,(concatenate 'string "cl_smoke_free_list_" c-name) :void

- "Frees LIST."

- (list :pointer))

- (defcfun ,(concatenate 'string "cl_smoke_make_list_" c-name) :pointer

- "Makes a list.")

- (defcfun ,(concatenate 'string "cl_smoke_list_" c-name "_at") :pointer

- "Returns the a newly constructed copy of the element at position AT of LIST."

- (list :pointer)

- (index :int))

- (defcfun ,(concatenate 'string "cl_smoke_list_" c-name "_append") :pointer

- "Appends NEW-ELEMENT to LIST."

- (list :pointer)

- (new-element :pointer))

- ;; To Lisp

- ,@(loop for type-name in (ensure-list type-name) collect

- `(defun ,(symbolicate 'from- type-name) (list-pointer)

- (let ((vector (make-array (,(symbolicate 'cl-smoke-list-

- type '-size)

- list-pointer))))

- (dotimes (index (length vector) vector)

- (setf (aref vector index)

- ;; FIXME the returned object is not wrapped by Smoke

- ;; -> change this?

- (smoke::object-to-lisp

- (,(symbolicate 'cl-smoke-list-

- type '-at)

- list-pointer index)

- (smoke::make-smoke-type *smoke-module*

- ,type-name)))))))

- ,@(loop for type-name in (ensure-list type-name) collect

- `(define-to-lisp-translation

- (,(format nil "const QList<~A>&" type-name)

- ,(format nil "QList<~A>" type-name))

- ,(symbolicate 'from- type-name)

- ,(symbolicate 'cl-smoke-free-list- type)))

- ;; From Lisp

- (defun ,(symbolicate 'coerce- list-type) (list)

- (let ((qlist (,(symbolicate 'cl-smoke-make-list- type))))

- (loop for element across list do

- (,(symbolicate 'cl-smoke-list- type '-append)

- qlist (pointer (make-instance ',element-type :args (list element)))))

- (make-cleanup-pointer

- qlist

- (function ,(symbolicate 'cl-smoke-free-list- type)))))

- (defun ,(symbolicate list-type '-p) (list)

- (every #'(lambda (element)

- (typep element ',element-type))

- list))

- ,@(loop for type-name in (ensure-list type-name) collect

- `(define-from-lisp-translation (,(format nil "const QList<~A>&" type-name)

- ,(format nil "QList<~A>" type-name))

- ;; FIXME allow sequence

- (and (vector ,element-type)

- (satisfies ,(symbolicate list-type '-p)))

- ,(symbolicate 'coerce- list-type))))))

+(defbitfield qlist-data-flags

+ :sharable)

+

+(defcstruct qlist-data

+ (ref :char :count #.(class-size (find-class 'qt:basic-atomic-int)))

+ (alloc :int)

+ (begin :int)

+ (end :int)

+ (flags qlist-data-flags)

+ (array :pointer))

+

+(defcstruct qlist

+ (data (:pointer qlist-data)))

+

+(defun qlist-size (qlist)

+ (let ((data (foreign-slot-value qlist 'qlist 'data)))

+ (- (foreign-slot-value data 'qlist-data 'end)

+ (foreign-slot-value data 'qlist-data 'begin))))

+

+(eval-when (:compile-toplevel :load-toplevel :execute)

+ (macrolet ((c-name (name)

+ `(nth-value 1 ,name))

+ (fun-names-let (name-pre-post-fixes &body body)

+ `(flet (,@(mapcar

+ #'(lambda (npp)

+ `(,(first npp) (type)

+ (values

+ (intern (string-upcase

+ (concatenate 'string

+ ,(second npp)

+ type

+ ,(third npp)))

+ ,*package*)

+ (concatenate 'string

+ (substitute #\_ #\-

+ ,(second npp))

+ type

+ (substitute #\_ #\-

+ ,(third npp))))))

+ name-pre-post-fixes))

+ ,@body)))

+ (fun-names-let ((list-free "cl-smoke-free-list-")

+ (list-make "cl-smoke-make-list-")

+ (list-at "cl-smoke-list-" "-at")

+ (list-append "cl-smoke-list-" "-append"))

+ (defmacro define-qlist-wrapper (type-name element-type &optional (c-name nil c-name-p)

+ &key def-cfuns)

+ (let* ((c-name (or c-name type-name))

+ (type c-name)

+ (lisp-type (symbolicate 'qlist- element-type)))

+ `(progn

+ ,(when (or (not c-name-p) def-cfuns)

+ `(progn

+ (defcfun ,(c-name (list-free type)) :void

+ "Frees LIST."

+ (list :pointer))

+ (defcfun ,(c-name (list-make type)) :pointer

+ "Makes a list.")

+ (defcfun ,(c-name (list-at type)) :pointer

+ "Returns the a newly constructed copy of the element at

+ position AT of LIST."

+ (list :pointer)

+ (index :int))

+ (defcfun ,(c-name (list-append type)) :pointer

+ "Appends NEW-ELEMENT to LIST."

+ (list :pointer)

+ (new-element :pointer))))

+ ;; To Lisp

+ ,@(loop for type-name in (ensure-list type-name) collect

+ `(defun ,(symbolicate 'from-list- type-name) (list-pointer)

+ (declare (optimize (speed 3)))

+ (let ((vector (make-array (qlist-size

+ list-pointer))))

+ (dotimes (index (length vector) vector)

+ (setf (elt vector index)

+ ;; FIXME the returned object is not wrapped by Smoke

+ ;; -> change this?

+ (object-to-lisp

+ (,(list-at type)

+ list-pointer index)

+ (make-smoke-type ,(symbolicate '*smoke-module*)

+ ,type-name)))))))

+ ,@(loop for type-name in (ensure-list type-name) collect

+ `(define-to-lisp-translation

+ (,(format nil "const QList<~A>&" type-name)

+ ,(format nil "QList<~A>" type-name))

+ ,(symbolicate 'from-list- type-name)

+ ,(list-free type)))

+ ;; From Lisp

+ (defun ,(symbolicate 'coerce- lisp-type) (list)

+ (let ((qlist (,(list-make type))))

+ (loop for element across list do

+ (,(list-append type)

+ qlist (pointer (make-instance ',element-type :args (list element)))))

+ (make-cleanup-pointer

+ qlist

+ (function ,(list-free type)))))

+ (defun ,(symbolicate lisp-type '-p) (list)

+ (every #'(lambda (element)

+ ;(typep element ',element-type))

+ (typep element (find-class ',element-type)))

+ list))

+ ,@(loop for type-name in (ensure-list type-name) collect

+ `(define-from-lisp-translation (,(format nil "const QList<~A>&" type-name)

+ ,(format nil "QList<~A>" type-name))

+ ;; FIXME allow sequence

+ (and (vector );,element-type)

+ (satisfies ,(symbolicate lisp-type '-p)))

+ ,(symbolicate 'coerce- lisp-type)))))))))

-;; FIXME it would be nice to have QList<QVariant> as fallback for any

-;; list we can not convert otherwise. e.g.: '("a" 1)

(define-qlist-wrapper "QVariant" qt:variant)

-(define-qlist-wrapper ("QObject*" "QWidget*") qt:object "void")

(define-qlist-wrapper "QByteArray" qt:byte-array)

+

+(define-qlist-wrapper "QObject*" qt:object "void" :def-cfuns t)

--- old-qt.core/src/package.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/package.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -2,6 +2,7 @@

(:use :cl :smoke :cffi :bordeaux-threads :cxx-support :alexandria)

(:export #:define-qvector-translations

#:with-application

+ #:delete-app

#:ensure-app

#:kill-app))

--- old-qt.core/src/qt.core.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/qt.core.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -33,6 +33,7 @@

(init-qt-smoke "init_qtcore_Smoke"))

(define-foreign-library libclsmokeqtcore

- (:unix "libclsmokeqtcore.so")

+ (:darwin "libclsmokeqtcore.dylib")

+ (:unix "libclsmokeqtcore.so")

(t (:default "libclsmokeqtcore")))

(use-foreign-library libclsmokeqtcore))

--- old-qt.core/src/signal-slot/connect.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/signal-slot/connect.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -115,20 +115,23 @@

(unless (qt:object.connect (qsender qt-signal) (qt:qsignal (name qt-signal))

(receiver qt-slot) (qt:qslot (name qt-slot))

(or type qt:+auto-connection+))

- (cerror "Failed to connect ~A ~A to ~A ~A."

+ (cerror "Ignore"

+ "Failed to connect ~A ~A to ~A ~A."

(qsender qt-signal) (name qt-signal)

(receiver qt-slot) (name qt-slot))))

(defmethod qt:disconnect ((qt-signal qt-signal) (qt-slot qt-slot))

(unless (qt:object.disconnect (qsender qt-signal) (qt:qsignal (name qt-signal))

- (receiver qt-slot) (qt:qslot (name qt-slot)))

- (cerror "Failed to disconnect ~A ~A from ~A ~A."

+ (receiver qt-slot) (qt:qslot (name qt-slot)))

+ (cerror "Ignore"

+ "Failed to disconnect ~A ~A from ~A ~A."

(receiver qt-slot) (name qt-slot)

(qsender qt-signal) (name qt-signal))))

(defmethod qt:disconnect-all ((sender qt:object))

(unless (qt:object.disconnect sender 0 0 0)

- (cerror "Failed to disconnect everything connected to ~A."

+ (cerror "Ignore"

+ "Failed to disconnect everything connected to ~A."

sender)))

--- old-qt.core/src/variant.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/variant.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -73,41 +73,62 @@

"Returns true when VARIANT is valid (has a value) and false otherwise."

(cxx:is-valid variant))

-(defmacro variant-conversions ((variant) &body types)

- `(ecase (cxx:user-type ,variant)

-

- ,@(loop for type in types collect

- (if (symbolp type)

- `(,(value (symbol-value

- (let ((*package* (find-package :cl-smoke.qt)))

- (alexandria:symbolicate 'variant.+ type '+))))

- (,(intern (format nil "TO-~A" type) :cxx) ,variant))

- type))))

+(defun copy-object-from-pointer (class pointer)

+ (make-instance class :arg0 (make-instance class :pointer pointer)))

-(defun qt:from-variant (variant)

- "Returns the value of VARIANT."

- (variant-conversions (variant)

- (#.(value qt:variant.+invalid+)

- (cerror "Return (VALUES)" "Type of variant ~A is invalid." variant)

- (values))

- bit-array bool byte-array

- char

- date date-time double

- int

- line line-f list locale long-long

- point point-f

- rect rect-f reg-exp

- size size-f string string-list

- time

- uint

- ulong-long

- url

- (#.*cxx-lisp-object-metatype*

- (let* ((lisp-object (cl-smoke-lisp-object-value (pointer variant)))

- (value))

- (setf value (translate-cxx-lisp-object lisp-object))

- (free-cxx-lisp-object lisp-object)

- value))))

+(eval-startup ()

+;; *cxx-lisp-object-metatype* can change when loading an image

+(eval '

+ (macrolet

+ ((variant-conversions ((variant) &body types)

+ (let* ((special-types '(long-long ulong-long map list hash))

+ (exclude-types

+ (append '(63) ;; ColorGroup

+ (mapcar #'(lambda (s)

+ (value

+ (symbol-value

+ (intern (format nil "VARIANT.+~A+" s)

+ :qt))))

+ special-types)))

+ (qt-types (loop for i from 1 to (value qt:variant.+user-type+)

+ when (and (qt:variant.type-to-name i)

+ ;; type-to-name returns longlong but

+ ;; should be LongLong

+ (not (member i exclude-types)))

+ collect

+ (smoke::lispify (qt:variant.type-to-name i)

+ :qt))))

+ `(ecase (cxx:user-type ,variant)

+ ,@(loop for type in (append special-types

+ (remove nil qt-types))

+ collect

+ `(,(value (symbol-value

+ (let ((*package*

+ (find-package :cl-smoke.qt)))

+ (symbolicate 'variant.+ type '+))))

+ ,(if (fboundp (intern (format nil "TO-~A" type) :cxx))

+ `(,(intern (format nil "TO-~A" type) :cxx) ,variant)

+ `(copy-object-from-pointer

+ ;; intern since these types are in

+ ;; qt.gui not qt.core

+ (intern ,(symbol-name type) :qt)

+ (cxx:const-data ,variant)))))

+ ,@(loop for type in types

+ collect

+ `(,(eval (first type))

+ ,@(rest type)))))))

+ (defun qt:from-variant (variant)

+ "Returns the value of VARIANT."

+ (variant-conversions (variant)

+ ((value qt:variant.+invalid+)

+ (cerror "Return (VALUES)" "Type of variant ~A is invalid." variant)

+ (values))

+ (*cxx-lisp-object-metatype*

+ (let* ((lisp-object (cl-smoke-lisp-object-value (pointer variant)))

+ (value))

+ (setf value (translate-cxx-lisp-object lisp-object))

+ (free-cxx-lisp-object lisp-object)

+ value)))))))

(defmethod qt:value ((variant qt:variant))

"Returns the value of VARIANT."

--- old-qt.core/src/vector.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/src/vector.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -33,7 +33,7 @@

(foreign-slot-value (foreign-slot-value qvector 'qvector 'data)

'qvector-data 'size))

-(defun qvector-aref (qvector index element-type)

+(defun qvector-elt (qvector index element-type)

(pointer-to-lisp

(cffi:inc-pointer

(foreign-slot-pointer (foreign-slot-value qvector 'qvector 'data)

@@ -44,8 +44,8 @@

(defun from-qvector (qvector element-type)

(let ((result (make-array (qvector-size qvector))))

(dotimes (i (length result) result)

- (setf (aref result i)

- (qvector-aref qvector i element-type)))))

+ (setf (elt result i)

+ (qvector-elt qvector i element-type)))))

(defcfun memcpy :pointer

(destination :pointer)

@@ -64,11 +64,11 @@

(if (class-p element-type)

(dotimes (i length)

(memcpy (inc-pointer darray (* i element-size))

- (pointer (aref elements i))

+ (pointer (elt elements i))

element-size))

(dotimes (i length)

(setf (mem-aref darray (type-foreign-keyword element-type) i)

- (aref elements i))))

+ (elt elements i))))

(setf (mem-ref data :int) 1) ;; ref count

(with-foreign-slots ((ref alloc size flags)

data qvector-data)

@@ -93,16 +93,6 @@

(null-pointer)))

(cl-smoke-delete-qvector vector))

-(defun from-vector-point (elements)

- (make-cleanup-pointer

- (make-qvector (make-smoke-type *smoke-module* "QPoint")

- elements)

- #'free-qvector))

-

-(defun vector-point-p (sequence)

- (every #'(lambda (element) (typep element 'qt:point))

- sequence))

-

(defmacro define-qvector-translations (element-type lisp-type)

`(progn

(defun ,(symbolicate 'from-vector- element-type) (elements)

--- old-qt.core/test.lisp 2014-10-30 07:25:30.000000000 +0100

+++ new-qt.core/test.lisp 2014-10-30 07:25:30.000000000 +0100

@@ -1,4 +1,11 @@

#|

+v v v v v v v

+cmake ./

+make

+*************

+cmake ./ || exit 1

+make || exit 1

+^ ^ ^ ^ ^ ^ ^

exec -a "$0" sbcl --noinform --noprint --disable-debugger --load $0 --end-toplevel-options "$@"

# Used for testing on darcs record.

|#