Update of /project/cells/cvsroot/cells-gtk3/gtk-ffi In directory clnet:/tmp/cvs-serv13587/gtk-ffi
Modified Files: gtk-adds.c gtk-ffi.asd gtk-gl-ext.lisp gtk-other.lisp gtk-utilities.lisp libcellsgtk.so package.lisp Log Message: Added OpenGL drawing area
--- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-adds.c 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-adds.c 2008/04/14 16:43:55 1.2 @@ -14,7 +14,8 @@ asm (".ascii " -export:gtk_adds_color_set_rgb""); asm (".ascii " -export:gtk_adds_ok""); asm (".ascii " -export:gtk_adds_g_thread_supported""); - +asm (".ascii " -export:gtk_adds_widget_height""); +asm (".ascii " -export:gtk_adds_widget_width""); /* Return a pointer to the vbox of a dialog. * Useful for adding widgets to dialogs. For example, * if you need a dialog with text entry capability. @@ -101,3 +102,16 @@ return g_thread_supported (); }
+/* This is to return the new allocated height/width after the user reshapes a widget */ +int +gtk_adds_widget_height (GtkWidget *wid) +{ + return wid->allocation.height; +} + +int +gtk_adds_widget_width (GtkWidget *wid) +{ + return wid->allocation.width; +} + --- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-ffi.asd 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-ffi.asd 2008/04/14 16:43:55 1.2 @@ -17,6 +17,7 @@ :pod-utils :cffi :cffi-uffi-compat + :utils-kt #+cells-gtk-threads :bordeaux-threads ) :components --- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-gl-ext.lisp 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-gl-ext.lisp 2008/04/14 16:43:55 1.2 @@ -15,7 +15,7 @@
(in-package :gtk-ffi)
-(export '(with-gl-drawable with-swap-buffers)) +;(export '(with-gl-drawable with-swap-buffers))
(cffi:define-foreign-library libgtkglext (:unix "libgtkglext-x11-1.0.so") @@ -104,4 +104,6 @@ (progn ,@body) (if (gdk-gl-drawable-is-double-buffered ,drawable) (gdk-gl-drawable-swap-buffers ,drawable)) - (gdk-gl-drawable-gl-end ,drawable)))) \ No newline at end of file + (gdk-gl-drawable-gl-end ,drawable)))) + + --- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-other.lisp 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-other.lisp 2008/04/14 16:43:55 1.2 @@ -892,7 +892,9 @@ (green :unsigned-int) (blue :unsigned-int))) (gtk-adds-ok :int ()) - (gtk-adds-g-thread-supported :int ())) + (gtk-adds-g-thread-supported :int ()) + (gtk-adds-widget-width :int ((widget :pointer))) + (gtk-adds-widget-height :int ((widget :pointer))))
#-libcellsgtk --- /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-utilities.lisp 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/gtk-utilities.lisp 2008/04/14 16:43:55 1.2 @@ -43,7 +43,6 @@ (defun wrap-func (func-address) ;; vestigial. func would never be nil. i think. (or func-address 0))
- (defun gtk-signal-connect-swap (widget signal fun &key (after t) (data +c-null+) (destroy-data +c-null+)) ; pod 0216 (g-signal-connect-closure widget signal (g-cclosure-new-swap (wrap-func fun) data destroy-data) after)) Binary files /project/cells/cvsroot/cells-gtk3/gtk-ffi/libcellsgtk.so 2008/04/13 10:59:23 1.1 and /project/cells/cvsroot/cells-gtk3/gtk-ffi/libcellsgtk.so 2008/04/14 16:43:55 1.2 differ --- /project/cells/cvsroot/cells-gtk3/gtk-ffi/package.lisp 2008/04/13 10:59:23 1.1 +++ /project/cells/cvsroot/cells-gtk3/gtk-ffi/package.lisp 2008/04/14 16:43:55 1.2 @@ -77,5 +77,6 @@ #:gdk-event-button-state #:gdk-event-motion-x #:gdk-event-motion-y - #:event-type)) + #:event-type
+ #:gl-init))