From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Sun, 1 Nov 2009 00:07:58 +0000 (+0300)
Subject: Add Gdk/Bitmaps and Pixmaps
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=c1ddf63c0f80da47aafcd23ea477b4982589412d;p=cl-gtk2.git

Add Gdk/Bitmaps and Pixmaps
---

diff --git a/gdk/cl-gtk2-gdk.asd b/gdk/cl-gtk2-gdk.asd
index a091b2e..7853bcd 100644
--- a/gdk/cl-gtk2-gdk.asd
+++ b/gdk/cl-gtk2-gdk.asd
@@ -12,5 +12,6 @@
                (:file "gdk.screen")
                (:file "gdk.region")
                (:file "gdk.gc")
-               (:file "gdk.drawing-primitives"))
+               (:file "gdk.drawing-primitives")
+               (:file "gdk.bitmaps"))
   :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-pango))
\ No newline at end of file
diff --git a/gdk/gdk.bitmaps.lisp b/gdk/gdk.bitmaps.lisp
new file mode 100644
index 0000000..f852ecb
--- /dev/null
+++ b/gdk/gdk.bitmaps.lisp
@@ -0,0 +1,93 @@
+(in-package :gdk)
+
+(defcfun (pixmap-new "gdk_pixmap_new") (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (width :int)
+  (height :int)
+  (depth :int))
+
+(export 'pixmap-new)
+
+(defcfun (bitmap-create-from-data "gdk_bitmap_create_from_data") (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (data :pointer)
+  (width :int)
+  (height :int))
+
+(export 'bitmap-create-from-data)
+
+(defcfun (pixmap-create-from-data "gdk_pixmap_create_from_data") (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (data :pointer)
+  (width :int)
+  (height :int)
+  (depth :int)
+  (fg-color (g-boxed-foreign color))
+  (bg-color (g-boxed-foreign color)))
+
+(export 'pixmap-create-from-data)
+
+(defcfun gdk-pixmap-create-from-xpm (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (mask :pointer)
+  (transparent-color (g-boxed-foreign color))
+  (filename :string))
+
+(defcfun gdk-pixmap-colormap-create-from-xpm (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (colormap (g-object colormap))
+  (mask :pointer)
+  (transparent-color (g-boxed-foreign color))
+  (filename :string))
+
+(defcfun gdk-pixmap-create-from-xpm-d (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (mask :pointer)
+  (transparent-color (g-boxed-foreign color))
+  (data (:pointer :pointer)))
+
+(defun gdk-pixmap-create-from-xpm-d-1 (drawable mask transparent-color data)
+  (let ((n (length data)))
+    (with-foreign-object (data-ptr :pointer n)
+      (let ((i 0))
+        (map nil
+             (lambda (str)
+               (setf (mem-aref data-ptr :pointer i) (cffi:foreign-string-alloc str))
+               (incf i))
+             data))
+      (gdk-pixmap-create-from-xpm-d drawable mask transparent-color data-ptr))))
+
+(defcfun gdk-pixmap-colormap-create-from-xpm-d (g-object pixmap :already-referenced)
+  (drawable (g-object drawable))
+  (colormap (g-object colormap))
+  (mask :pointer)
+  (transparent-color (g-boxed-foreign color))
+  (data (:pointer :pointer)))
+
+(defun gdk-pixmap-colormap-create-from-xpm-d-1 (drawable colormap mask transparent-color data)
+  (let ((n (length data)))
+    (with-foreign-object (data-ptr :pointer n)
+      (let ((i 0))
+        (map nil
+             (lambda (str)
+               (setf (mem-aref data-ptr :pointer i) (cffi:foreign-string-alloc str))
+               (incf i))
+             data))
+      (gdk-pixmap-colormap-create-from-xpm-d drawable colormap mask transparent-color data-ptr))))
+
+(defun pixmap-create-from-xpm (drawable transparent-color &key (colormap nil colormap-p) (filename nil filename-p) (xpm-data nil xpm-p))
+  (unless (or filename-p xpm-p)
+    (error "FILENAME or XPM-DATA must be specified"))
+  (when (and filename-p xpm-p)
+    (error "FILENAME and XPM-DATA may not be specified at the same time"))
+  (with-foreign-object (mask-ptr :pointer)
+    (let ((pixmap (if filename-p
+                      (if colormap-p
+                          (gdk-pixmap-colormap-create-from-xpm drawable colormap mask-ptr transparent-color filename)
+                          (gdk-pixmap-create-from-xpm drawable mask-ptr transparent-color filename))
+                      (if colormap-p
+                          (gdk-pixmap-colormap-create-from-xpm-d-1 drawable colormap mask-ptr transparent-color xpm-data)
+                          (gdk-pixmap-create-from-xpm-d-1 drawable mask-ptr transparent-color xpm-data)))))
+      (values pixmap (convert-from-foreign mask-ptr '(g-object pixmap :already-referenced))))))
+
+(export 'pixmap-create-from-xpm)