Changed name of double linked list type to glist.

[clg] / gdk / gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 1baa5b6a715df2ad0df1ac04268283bdf859b98c..d418022070bdfcbe31fcb74f86a0849b7bfe7cfa 100644 (file)
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdk.lisp,v 1.2 2000-08-23 17:32:30 espen Exp $
+;; $Id: gdk.lisp,v 1.5 2000-10-05 17:19:26 espen Exp $
 
 
 (in-package "GDK")
@@ -31,8 +31,39 @@ (in-package "GDK")
 (defun find-event-class (event-type)
   (find-class
    (ecase event-type
+     (:delete 'delete-event)
+     (:destroy  'destroy-event)
      (:expose 'expose-event)
-     (:delete 'delete-event))))
+     (:motion-notify 'motion-notify-event)
+     (:button-press 'button-press-event)
+     (:2button-press '2-button-press-event)
+     (:3button-press '3-button-press-event)
+     (:button-release 'button-release-event)
+     (:key-press 'key-press-event)
+     (:key-release 'key-release-event)
+     (:enter-notify 'enter-notify-event)
+     (:leave-notify 'leave-notify-event)
+     (:focus-change 'focus-change-event)
+     (:configure 'configure-event)
+     (:map 'map-event)
+     (:unmap 'unmap-event)
+     (:property-notify 'property-notify-event)
+     (:selection-clear 'selection-clear-event)
+     (:selection-request 'selection-request-event)
+     (:selection-notify 'selection-notify-event)
+     (:proximity-in 'proximity-in-event)
+     (:proximity-out 'proximity-out-event)
+     (:drag-enter 'drag-enter-event)
+     (:drag-leave 'drag-leave-event)
+     (:drag-motion 'drag-motion-event)
+     (:drag-status 'drag-status-event)
+     (:drop-start 'drop-start-event)
+     (:drop-finished 'drop-finished-event)
+     (:client-event 'client-event-event)
+     (:visibility-notify 'visibility-notify-event)
+     (:no-expose 'no-expose-event)
+     (:scroll 'scroll-event))))
+
 
 (deftype-method alien-copier event (type-spec)
   (declare (ignore type-spec))
@@ -176,7 +207,7 @@ (defun visual-get-best (&key depth type)
 
 ;(define-foreign query-visual-types ..)
 
-(define-foreign list-visuals () (double-list visual))
+(define-foreign list-visuals () (glist visual))
 
 
 ;;; Windows
@@ -396,12 +427,12 @@ (define-foreign %pixmap-colormap-create-from-xpm () pixmap
   (color (or null color))
   (filename string))
 
-(define-foreign pixmap-colormap-create-from-xpm-d () pixmap
+(define-foreign %pixmap-colormap-create-from-xpm-d () pixmap
   (window (or null window))
   (colormap (or null colormap))
   (mask bitmap :out)
   (color (or null color))
-  (data pointer))
+  (data (vector string)))
 
 (defun pixmap-create (source &key color window colormap)
   (let ((window
@@ -409,14 +440,12 @@ (defun pixmap-create (source &key color window colormap)
             (get-root-window)
           window)))
     (multiple-value-bind (pixmap mask)
-        (typecase source
+        (etypecase source
          ((or string pathname)
           (%pixmap-colormap-create-from-xpm
            window colormap color (namestring (truename source))))
-;        (t
-;         (with-array (data :initial-contents source :free-contents t)
-;           (pixmap-colormap-create-from-xpm-d window colormap color data)))
-         )
+         ((vector string)
+          (%pixmap-colormap-create-from-xpm-d window colormap color source)))
       (unreference-instance pixmap)
       (unreference-instance mask)
       (values pixmap mask))))
@@ -431,21 +460,24 @@ (defun %scale-value (value)
     (float (truncate (* value 65535)))))
 
 (defmethod initialize-instance ((color color) &rest initargs
-                               &key (colors #(0 0 0)) red green blue)
+                               &key red green blue)
   (declare (ignore initargs))
   (call-next-method)
   (with-slots ((%red red) (%green green) (%blue blue)) color
     (setf
-     %red (%scale-value (or red (svref colors 0)))
-     %green (%scale-value (or green (svref colors 1)))
-     %blue (%scale-value (or blue (svref colors 2))))))
+     %red (%scale-value red)
+     %green (%scale-value green)
+     %blue (%scale-value blue))))
 
 
 (defun ensure-color (color)
   (etypecase color
     (null nil)
     (color color)
-    (vector (make-instance 'color :colors color))))
+    (vector
+     (make-instance
+      'color :red (svref color 0) :green (svref color 1)
+      :blue (svref color 2)))))