Commit c2f6f2f3 authored by georgej's avatar georgej
Browse files

see ChangeLog.n for Tue Nov 7 16:44:25 1995

parent dc9471d9
*************************************************************
4.3.devel.9 (beta preparation)
Tue Nov 7 16:44:25 1995 George Jacob (georgej@lava)
* xlib/load-xlib.lisp: specify lp host clim2: for *.o files
* utils/excl-verification.lisp: Change to CLIM 2.1.beta
* tk/load-xm.lisp: specify logical-pathname host clim2: for *.o files
* various files: Change FAR Supplement number in Copyright message
* clim/standard-types.lisp: Modified cond() clause to fix reload-problem
* Makefile.generic: Added backslash for line continuation
* Makefile.cobjs: Added backslash for line continuation
* tk-silica/last.lisp: Change patch directory name to update-clim2
* sys/sysdcl.lisp: Change feature to 2.1
* utils/excl-verification.lisp: update *clim-version* to 2.1.beta
*************************************************************
Fri Oct 20 11:03:26 PDT 1995 Colin Meldrum (colin@vapor)
......
......@@ -71,5 +71,5 @@ mainxm.o: $(ACL_MAIN_OBJ) $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(STATIC-WNN
(eval '$(SET_LIBRARY_PATH)' ; \
ld -r $(LDFLAGS) -o mainxm.o \
$(ACL_MAIN_OBJ) \
$(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(STATIC-WNN-OBJS)
$(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(STATIC-WNN-OBJS) \
$(TKLIB) $(XTLIB) $(XLIB) $(WNNLIB) $(MOTIFXTRAS))
......@@ -263,7 +263,7 @@ ucl.clim: stub-x.o $(STATIC-WNN-OBJS) stub-xt.o stub-motif.o \
/bin/mv dcl dcl.climsave ; $(SAVEEXP) ;\
make stubs=$(stubs) \
user_objects=' \
$(PWD)/stub-x.o $(STATIC-WNN-OBJS-WITH-PWD) $(PWD)/stub-xt.o
$(PWD)/stub-x.o $(STATIC-WNN-OBJS-WITH-PWD) $(PWD)/stub-xt.o\
$(PWD)/stub-motif.o \
$(PWD)/xlibsupport.o $(PWD)/xmsupport.o $(PWD)/xtsupport.o \
$(TKLIB) $(XTLIB) $(XLIB) $(WNNLIB) $(MOTIFXTRAS)' ucl ;\
......
......@@ -2,7 +2,7 @@
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -17,9 +17,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: excl-presentations.lisp,v 1.15 93/01/21 14:57:51 cer Exp $
......@@ -46,7 +45,7 @@
(defmethod excl::stream-io-record-type ((stream output-recording-mixin))
nil)
(defclass standard-excl-presentation (standard-presentation)
(defclass standard-excl-presentation (standard-presentation)
()
(:default-initargs :single-box nil
:type 'expression))
......@@ -63,7 +62,7 @@
;; Record initialized with :object, :type maybe
(defmethod excl::set-io-record-pos1 ((stream output-recording-mixin) record)
(let ((current-output-position
(let ((current-output-position
(stream-output-history-position stream)))
(multiple-value-bind (px py)
(point-position current-output-position)
......@@ -83,11 +82,11 @@
(defmethod excl::set-io-record-pos2 ((stream output-recording-mixin) record)
(stream-close-text-output-record stream)
(let ((current-output-position
(stream-output-history-position stream)))
(let ((current-output-position
(stream-output-history-position stream)))
(destructuring-bind (parent abs-x abs-y)
(pop (stream-excl-presentation-stack stream))
(unless parent
(unless parent
(setq parent (stream-output-history stream)))
(multiple-value-bind (end-x end-y)
(stream-cursor-position stream)
......@@ -116,4 +115,4 @@
(#\b (window-stream-bold-font stm))
(#\i (window-stream-italic-font stm))
(#\j (window-stream-bold-italic-font stm)))))))
;;; -*- Mode: LISP; Syntax: Common-lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, Ca. All rights reserved.
;; copyright (c) 1986-1991 Franz Inc, Berkeley, Ca. All rights reserved.
;;
......@@ -14,9 +14,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Suppplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: logical-gestures.lisp,v 1.3 92/02/24 13:08:04 cer Exp $
......@@ -26,11 +25,11 @@
"Copyright (c) 1988, 1989, 1990 International Lisp Associates. All rights reserved."
;;; a logical-gesture-name is a symbol that is not eq to a defined keysym or a
;;; defined shift.
;;; defined shift.
;;; Needed: Efficient mechanism for comparing a key-press-event, a character,
;;; Needed: Efficient mechanism for comparing a key-press-event, a character,
;;; or a button-press-event with a gesture spec.
;;; This mechanism will be used by presentation translator lookup, as well as by the
;;; This mechanism will be used by presentation translator lookup, as well as by the
;;; input editor.
;;;
;;; For presentation sensitivity, a way of finding out whether a particular set of shifts
......@@ -59,13 +58,13 @@
(with-collection
(dolist (spec new-specs)
(collect (parse-gesture-spec spec))))))
(setf (gethash logical-gesture-name *logical-gesture-name->gesture-spec-table*)
(setf (gethash logical-gesture-name *logical-gesture-name->gesture-spec-table*)
(delete-duplicates canonical-new-specs :test #'equal))))
(defsetf logical-gesture-name-gesture-specs set-logical-gesture-name-gesture-specs)
;;; Normal activity for programmers, adding new gesture specs to an existing
;;; logical gesture name, as in
;;; logical gesture name, as in
;;; (push '(:meta :middle) (logical-gesture-name-gesture-specs :edit-definition))
;;; (push '(:control :return) (logical-gesture-name-gesture-specs :make-new))
;;; (push ':make-new (logical-gesture-name-gesture-specs :edit-definition))
......@@ -177,7 +176,7 @@
;; :meta
(:edit-definition :left :meta)
)
)
......@@ -1097,7 +1097,9 @@
(define-presentation-method describe-presentation-type
((type sequence-enumerated) stream plural-count)
(declare (ignore plural-count)) ;it's too hard to handle
(cond ((let ((type (first element-types)))
(cond ((null element-types)
(write-string "null sequence" stream))
((let ((type (first element-types)))
(dolist (x (cdr element-types) t)
(unless (equal x type)
(return nil))))
......
;; -*- mode: common-lisp; package: user -*-
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,24 +16,23 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: cload-demos.lisp,v 1.6 1993/05/25 20:41:31 cer Exp $
(in-package :clim-user)
(defvar *demo-files*
(defvar *demo-files*
'(
"test-suite"
"packages"
"demo-driver"
"cad-demo"
"thinkadot"
"graphics-demos"
"address-book"
"listener"
"thinkadot"
"graphics-demos"
"address-book"
"listener"
"navfun"
"navdata"
"puzzle"
......@@ -48,11 +47,11 @@
"custom-records"
"browser"))
(defun compile-and-load-demos (&key forcep
(defun compile-and-load-demos (&key forcep
(directory
(make-pathname
(make-pathname
:directory (pathname-directory
#.(truename
#.(truename
excl::*source-pathname*)))))
(mapcar #'(lambda (name)
(let ((name (merge-pathnames
......
;; -*- mode: common-lisp; package: clim-internals -*-
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
(in-package :clim-internals)
......@@ -33,11 +32,11 @@
(loop
(let* ((*standard-output*
(or (frame-standard-output frame) *standard-output*))
(*standard-input*
(*standard-input*
(or (frame-standard-input frame) *standard-output*))
(*query-io*
(*query-io*
(or (frame-query-io frame) *standard-input*))
(*error-output*
(*error-output*
(or (frame-error-output frame) *standard-output*))
(*pointer-documentation-output*
(frame-pointer-documentation-output frame))
......@@ -49,9 +48,9 @@
#'command-line-command-parser
#'menu-command-parser)))
(*command-unparser*
(or command-unparser
(or command-unparser
#'command-line-command-unparser))
(*partial-command-parser*
(*partial-command-parser*
(or partial-command-parser
(if interactor
#'command-line-read-remaining-arguments-for-partial-command
......
;; -*- mode: common-lisp; package: user -*-
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: demo-last.lisp,v 1.1 1993/08/12 16:03:34 cer Exp $
......
;; -*- mode: common-lisp; package: silica -*-
;;
;; -[Thu Jul 22 17:16:08 1993 by colin]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,15 +16,14 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: db-label.lisp,v 1.3 1993/07/27 01:50:31 colin Exp $
(in-package :silica)
(defclass generic-label-pane
(defclass generic-label-pane
(label-pane
space-requirement-mixin
leaf-pane)
......@@ -37,7 +36,7 @@
(multiple-value-bind (width height)
(compute-gadget-label-size pane)
(make-space-requirement :width width :height height)))
(defmethod handle-repaint ((pane generic-label-pane) region)
(declare (ignore region)) ;not worth checking
(with-sheet-medium (medium pane)
......@@ -56,7 +55,7 @@
(draw-text* medium label x y
:text-style text-style
:align-x align-x :align-y align-y)))
(null)
(null)
(pattern
(let ((width (pattern-width label))
(height (pattern-height label)))
......
;; -*- mode: common-lisp; package: silica -*-
;;
;; -[Thu Jul 22 17:16:08 1993 by colin]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader:$
......
;; -*- mode: common-lisp; package: system -*-
;;
;; -[Fri Apr 16 11:55:09 1993 by layer]-
;;
;;
;; copyright (c) 1991 Franz Inc, Berkeley, CA All rights reserved.
;;
;; The software, data and information contained herein are proprietary
......@@ -15,9 +15,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: instclimol.lisp,v 1.7 1993/07/27 01:37:41 colin Exp $
......
......@@ -15,9 +15,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: instclimxm.lisp,v 1.10 1995/05/17 19:47:23 colin Exp $
......
......@@ -13,9 +13,8 @@
* Use, duplication, and disclosure of the software, data and information
* contained herein by any agency, department or entity of the U.S.
* Government are subject to restrictions of Restricted Rights for
* Commercial Software developed at private expense as specified in FAR
* 52.227-19 or DOD FAR Supplement 252 52.227-7013 (c) (1) (ii), as
* applicable.
* Commercial Software developed at private expense as specified in
* DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
*
* $fiHeader: MyDrawingA.c,v 1.5 1993/07/27 01:47:40 colin Exp $
*/
......
......@@ -13,9 +13,8 @@
* Use, duplication, and disclosure of the software, data and information
* contained herein by any agency, department or entity of the U.S.
* Government are subject to restrictions of Restricted Rights for
* Commercial Software developed at private expense as specified in FAR
* 52.227-19 or DOD FAR Supplement 252 52.227-7013 (c) (1) (ii), as
* applicable.
* Commercial Software developed at private expense as specified in
* DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
*
* $fiHeader: MyDrawingA.h,v 1.1 92/05/13 08:54:22 cer Exp $
*/
......
......@@ -13,9 +13,8 @@
* Use, duplication, and disclosure of the software, data and information
* contained herein by any agency, department or entity of the U.S.
* Government are subject to restrictions of Restricted Rights for
* Commercial Software developed at private expense as specified in FAR
* 52.227-19 or DOD FAR Supplement 252 52.227-7013 (c) (1) (ii), as
* applicable.
* Commercial Software developed at private expense as specified in
* DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
*
* $fiHeader: MyDrawingAP.h,v 1.1 92/05/13 08:54:23 cer Exp $
*/
......
;; -*- mode: common-lisp; package: clos -*-
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: clos-preload.cl,v 1.2 92/06/03 18:19:07 cer Exp $
......
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: compile-1.lisp,v 1.27 1994/12/04 23:59:48 colin Exp $
......
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: dev-load-1.lisp,v 1.36 1995/05/17 19:48:50 colin Exp $
......
;; -*- mode: common-lisp; package: user -*-
;;
;; -[]-
;;
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved.
;;
......@@ -16,9 +16,8 @@
;; Use, duplication, and disclosure of the software, data and information
;; contained herein by any agency, department or entity of the U.S.
;; Government are subject to restrictions of Restricted Rights for
;; Commercial Software developed at private expense as specified in FAR
;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
;; applicable.
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $fiHeader: dump.lisp,v 1.6 1993/07/27 01:47:54 colin Exp $
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment