[Phemlock-cvs] CVS update: phemlock/src/bitmap/bit-screen.lisp phemlock/src/bitmap/hunk-draw.lisp phemlock/src/bitmap/rompsite.lisp

[Aleksandar Bakic]

Update of /project/phemlock/cvsroot/phemlock/src/bitmap
In directory common-lisp.net:/tmp/cvs-serv4954/src/bitmap

Modified Files:
	bit-screen.lisp hunk-draw.lisp rompsite.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:48 2004
Author: abakic

Index: phemlock/src/bitmap/bit-screen.lisp
diff -u phemlock/src/bitmap/bit-screen.lisp:1.2 phemlock/src/bitmap/bit-screen.lisp:1.3
--- phemlock/src/bitmap/bit-screen.lisp:1.2	Tue Aug 10 14:47:06 2004
+++ phemlock/src/bitmap/bit-screen.lisp	Sat Sep  4 01:06:46 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/bit-screen.lisp,v 1.2 2004/08/10 12:47:06 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/bit-screen.lisp,v 1.3 2004/09/03 23:06:46 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,7 +18,11 @@
 
 (in-package :hemlock.x11)
 
-(declaim (special *echo-area-window*))
+(declaim (special *echo-area-window* ; defined in echo --amb
+		  *cursor-background-color* ; defined too late --amb
+		  *cursor-foreground-color* ; defined too late --amb
+		  *hemlock-cursor* ; defined too late --amb
+		  ))
 
 ;;; We have an internal notion of window groups on bitmap devices.  Every
 ;;; Hemlock window has a hunk slot which holds a structure with information
@@ -1122,22 +1126,24 @@
 
 
 ;;;; Setting window width and height.
+;;; Commented out by amb because of a side effect of undefining the
+;;; window struct.
 
 ;;; (SETF WINDOW-WIDTH)  --  Internal
 ;;;
 ;;;    Since we don't support non-full-width windows, this does nothing.
 ;;;
-(defun (setf window-width) (new-value window)
-  (declare (ignore window))
-  new-value)
+;;;(defun (setf window-width) (new-value window)
+;;;  (declare (ignore window))
+;;;  new-value)
 
 ;;; (SETF WINDOW-HEIGHT)  --  Internal
 ;;;
 ;;;    Can't change window height either.
 ;;;
-(defun (setf window-height) (new-value window)
-  (declare (ignore window))
-  new-value)
+;;;(defun (setf window-height) (new-value window)
+;;;  (declare (ignore window))
+;;;  new-value)
 
 
 


Index: phemlock/src/bitmap/hunk-draw.lisp
diff -u phemlock/src/bitmap/hunk-draw.lisp:1.1.1.1 phemlock/src/bitmap/hunk-draw.lisp:1.2
--- phemlock/src/bitmap/hunk-draw.lisp:1.1.1.1	Fri Jul  9 15:38:02 2004
+++ phemlock/src/bitmap/hunk-draw.lisp	Sat Sep  4 01:06:48 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/hunk-draw.lisp,v 1.1.1.1 2004/07/09 13:38:02 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/hunk-draw.lisp,v 1.2 2004/09/03 23:06:48 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,11 @@
 ;;;
 (in-package :hemlock.x11)
 
-
+(declaim (special *default-background-pixel* ; defined in bit-screen --amb
+		  *foreground-background-xor* ; defined in bit-screen --amb
+		  *default-font-family* ; defined in font --amb
+		  *current-window* ; defined in window --amb
+		  ))
 ;;;; TODO
 
 ;; . concentrate these in a single point where we draw a string, so that we
@@ -471,6 +475,13 @@
 	  (incf x font-width))))))
 
 ;; $Log: hunk-draw.lisp,v $
+;; Revision 1.2  2004/09/03 23:06:48  abakic
+;; Changes to get rid of warnings and notes. As a side-effect, more code
+;; has been commented out. There should be no more warnings nor notes
+;; with CMUCL, and only two style warnings with SBCL. Not tested with
+;; other implementations yet. TODO: spread key bindings to different
+;; files.
+;;
 ;; Revision 1.1.1.1  2004/07/09 13:38:02  gbaumann
 ;; import
 ;;


Index: phemlock/src/bitmap/rompsite.lisp
diff -u phemlock/src/bitmap/rompsite.lisp:1.1.1.1 phemlock/src/bitmap/rompsite.lisp:1.2
--- phemlock/src/bitmap/rompsite.lisp:1.1.1.1	Fri Jul  9 15:38:05 2004
+++ phemlock/src/bitmap/rompsite.lisp	Sat Sep  4 01:06:48 2004
@@ -96,7 +96,7 @@
 ;;;    This function should be called whenever the editor is entered in a new
 ;;; lisp.  It sets up process specific data structures.
 ;;;
-(defun init-raw-io (display)
+#+nilamb-duplicate(defun init-raw-io (display)
   #-clx (declare (ignore display))
   (setf *editor-windowed-input* nil)
   (cond #+clx
@@ -107,6 +107,7 @@
                #-(or sbcl CMU scl openmcl) (xlib:open-display "localhost"))
 	 (setf *editor-input* (make-windowed-editor-input))
 	 (setup-font-family *editor-windowed-input*))
+	#+nilamb
 	(t ;; The editor's file descriptor is Unix standard input (0).
 	   ;; We don't need to affect system:*file-input-handlers* here
 	   ;; because the init and exit methods for tty redisplay devices