[mcclim-cvs] CVS mcclim/Backends/Graphic-Forms

[junrue]

Update of /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms
In directory clnet:/tmp/cvs-serv12957/Backends/Graphic-Forms

Modified Files:
	medium.lisp 
Added Files:
	pixmap.lisp 
Log Message:
define new class graphic-forms-pixmap; separate a few pixmap-related methods
from medium.lisp to the new pixmap.lisp


--- /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/medium.lisp	2007/09/09 03:47:08	1.8
+++ /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/medium.lisp	2007/09/30 21:12:50	1.9
@@ -1,6 +1,6 @@
 ;; -*- Mode: Lisp; Package: CLIM-GRAPHIC-FORMS -*-
 
-;;; (c) 2006 Jack D. Unrue (jdunrue (at) gmail (dot) com)
+;;; (c) 2006-2007 Jack D. Unrue (jdunrue (at) gmail (dot) com)
 ;;; based on the null backend by:
 ;;;  (c) 2005 Christophe Rhodes (c.rhodes at gold.ac.uk)
 
@@ -55,6 +55,8 @@
 
 (defun ink-to-color (medium ink)
   (cond
+    ((subtypep (class-of ink) (find-class 'climi::opacity))
+     (setf ink (medium-foreground medium))) ; see discussion of opacity in design.lisp
     ((eql ink +foreground-ink+)
      (setf ink (medium-foreground medium)))
     ((eql ink +background-ink+)
@@ -184,30 +186,6 @@
 (defmethod (setf medium-line-style) :before (line-style (medium graphic-forms-medium))
   ())
 
-(defmethod medium-copy-area ((from-drawable graphic-forms-medium)
-			     from-x from-y width height
-                             (to-drawable graphic-forms-medium)
-			     to-x to-y)
-  nil)
-
-#+nil ; FIXME: PIXMAP class
-(progn
-  (defmethod medium-copy-area ((from-drawable graphic-forms-medium)
-			       from-x from-y width height
-			       (to-drawable pixmap)
-			       to-x to-y)
-    nil)
-  (defmethod medium-copy-area ((from-drawable pixmap)
-			       from-x from-y width height
-			       (to-drawable graphic-forms-medium)
-			       to-x to-y)
-    ())
-  (defmethod medium-copy-area ((from-drawable pixmap)
-			       from-x from-y width height
-			       (to-drawable pixmap)
-			       to-x to-y)
-    ()))
-
 (defmethod medium-draw-point* ((medium graphic-forms-medium) x y)
   (when (target-of medium)
     (gfw:with-graphics-context (gc (target-of medium))

--- /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/pixmap.lisp	2007/09/30 21:12:50	NONE
+++ /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/pixmap.lisp	2007/09/30 21:12:50	1.1
;;; -*- Mode: Lisp; Package: CLIM-GRAPHIC-FORMS; -*-

;;; (c) 2007 Jack D. Unrue (jdunrue (at) gmail (dot) com)
;;; based on the null backend by:

;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
;;; License as published by the Free Software Foundation; either
;;; version 2 of the License, or (at your option) any later version.
;;;
;;; 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
;;; Library General Public License for more details.
;;;
;;; You should have received a copy of the GNU Library 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.

(in-package :clim-graphic-forms)

(defclass graphic-forms-pixmap (climi::mirrored-pixmap) ())

(defmethod medium-copy-area ((from-drawable graphic-forms-medium)
                             from-x from-y width height
                             (to-drawable graphic-forms-medium)
                             to-x to-y)
  ())

(defmethod medium-copy-area ((from-drawable graphic-forms-medium)
                             from-x from-y width height
                             (to-drawable graphic-forms-pixmap)
                             to-x to-y)
  ())

(defmethod medium-copy-area ((from-drawable graphic-forms-pixmap)
                             from-x from-y width height
                             (to-drawable graphic-forms-medium)
                             to-x to-y)
  ())

(defmethod medium-copy-area ((from-drawable graphic-forms-pixmap)
                             from-x from-y width height
                             (to-drawable graphic-forms-pixmap)
                             to-x to-y)
  ())