diff --git a/ChangeLog.n b/ChangeLog.n index 84d16abf0cbfb742535b112337c3041a658c3f8e..d93578b4092a12754830b8326cbac08f0d336b9a 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -1,3 +1,25 @@ +************************************************************* +4.3.devel.4 (aka 4.3.alpha.0) + +Wed Jun 21 11:10:05 1995 George Jacob (georgej@lava) + +* Makefile.generic: use TKLIB instead of MOTIFLIB + +* tk/load-xm.lisp: replace toolkit-shared with toolkit-static + +* tk/xm-defs.lisp: remove defconstant +* tk/xm-widgets.lisp: add defconstant + +* tk/xm-font-list.lisp: + +* tk/xm-init.lisp: reinitialize toolkit by default for DLFCN + ports + +* tk-silica/gc-cursor.lisp: remove debugging comments + +* utils/excl-verification.lisp: update *clim-version* (to 2.1) + + Tue May 16 23:23:13 PDT 1995 Colin Meldrum (colin@vapor) Makefile.cobj-svr4 REMOVED - dlfcn and non-dlfcn both now handled in diff --git a/Makefile.generic b/Makefile.generic index 17b1d9d2a1875954185a53bb4082b7d944cb707c..aa0b6c08feca14c9bfa55abd1f40e3f52dbb46fe 100644 --- a/Makefile.generic +++ b/Makefile.generic @@ -141,7 +141,6 @@ train: FORCE load-train: FORCE (eval '$(SET_LIBRARY_PATH)' ; \ $(ECHO) " \ - (progn \ (setf (logical-pathname-translations \"clim2\") \ \`((\";**;*.*\" ,(current-directory)))) \ #+ignore (load-logical-pathname-translations \"clim2\") \ @@ -154,8 +153,8 @@ load-train: FORCE (train-clim :frame-tests $(FRAME_TESTS) :train-times $(TRAIN_TIMES) \ :benchmarkp $(TRAIN_BM) :profilep $(TRAIN_PROFILEP) \ :compile $(TRAIN_COMPILE) :psview $(PSVIEW) \ - :hpglview $(HPGLVIEW) :report-file \"$(REPORT_FILE)\") - (clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\"))" \ + :hpglview $(HPGLVIEW) :report-file \"$(REPORT_FILE)\") \ + (clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\")" \ | $(CL) $(CLOPTS)) generate_test_report: FORCE @@ -204,6 +203,9 @@ echo_XTLIB: echo_XLIB: @echo $(XLIB) +echo_TKLIB: + @echo $(TKLIB) + makeclimfasls: compile cat install_obj: @@ -220,25 +222,24 @@ makeclimobjs: $(PRODUCT-GENERIC-OBJS) $(PRODUCT-TK-OBJS) ################## Lower level Makefile stuff xm-dcl : stub-x.o stub-xt.o stub-motif.o xlibsupport.o xtsupport.o xmsupport.o - cd $(CL_SRC) - /bin/mv ucl ucl.climsave ; $(SAVEEXP) + cd $(CL_SRC) ; /bin/mv ucl ucl.climsave ; $(SAVEEXP) ;\ make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) \ newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) stubs=$(stubs) \ user_objects='$(PWD)/stub-x.o $(PWD)/stub-xt.o \ $(PWD)/stub-motif.o $(PWD)/xlibsupport.o $(PWD)/xmsupport.o \ $(PWD)/xtsupport.o $(CL_SRC)/code/excldep.o $(CL_SRC)/code/socket.o \ - $(MOTIFLIB) $(XTLIB) $(XLIB)' dcl ;\ + $(TKLIB) $(XTLIB) $(XLIB)' dcl ;\ /bin/mv ucl.climsave ucl; $(RESTEXP) ucl.clim: stub-x.o stub-xt.o stub-motif.o xlibsupport.o xtsupport.o xmsupport.o - cd $(CL_SRC) - /bin/mv ucl ucl.climsave ; /bin/mv dcl dcl.climsave ; $(SAVEEXP) + cd $(CL_SRC) ; /bin/mv ucl ucl.climsave ;\ + /bin/mv dcl dcl.climsave ; $(SAVEEXP) ;\ make stubs=$(stubs) \ user_objects=' \ $(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/stub-motif.o \ $(PWD)/xlibsupport.o $(PWD)/xmsupport.o $(PWD)/xtsupport.o \ $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)' ucl ;\ - /bin/mv ucl ucl.clim ; $(RESTEXP) ; /bin/mv ucl.climsave ucl + /bin/mv ucl ucl.clim ; $(RESTEXP) ; /bin/mv ucl.climsave ucl ; \ /bin/mv dcl.climsave dcl ################## End of make-dist stuff diff --git a/tk-silica/gc-cursor.lisp b/tk-silica/gc-cursor.lisp index 3577cdfa42ee7017cdeed5966b7270194df4e96d..74c637d0de178b6d2242713daeca7a801a296582 100644 --- a/tk-silica/gc-cursor.lisp +++ b/tk-silica/gc-cursor.lisp @@ -1,7 +1,7 @@ ;; -*- mode: common-lisp; package: xm-silica -*- ;; ;; -[Fri Nov 11 15:11:52 1994 by smh]- -;; +;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. ;; @@ -33,10 +33,7 @@ (when *use-clim-gc-cursor* (unless *gc-before* ; Do just once. (let ((vec (vector nil nil))) - (format excl:*initial-terminal-io* "~&Vec before ~s~%" vec) (tk::init_clim_gc_cursor_stuff vec) - (format excl:*initial-terminal-io* "~&Vec after ~s~%" vec) - (force-output excl:*initial-terminal-io*) (setq *gc-before* (svref vec 0) *gc-after* (svref vec 1)) (pushnew *gc-before* (excl::gc-before-hooks)) @@ -45,9 +42,9 @@ (let* ((sheet (frame-top-level-sheet frame)) (mirror (and sheet (sheet-direct-mirror sheet)))) (if mirror - (tk::set_clim_gc_cursor_widget + (tk::set_clim_gc_cursor_widget mirror - (realize-cursor (port sheet) + (realize-cursor (port sheet) sheet (sheet-pointer-cursor sheet))) (tk::set_clim_gc_cursor_widget 0 0))))) @@ -56,7 +53,7 @@ (declare (ignore cursor)) (init-gc-cursor (pane-frame sheet))) -(defmethod clim-internals::receive-gesture :after ((stream xt-top-level-sheet) +(defmethod clim-internals::receive-gesture :after ((stream xt-top-level-sheet) (gesture pointer-enter-event)) ;; If the top level window has a cursor we need to pass that in somehow ;; so that it gets restored appropriately. diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp index 1b7aeb0f534584d185365dfb14453cb8faf88a87..7242ab4d80321f7ec13f79042aeb6cf160d128ed 100644 --- a/tk/load-xm.lisp +++ b/tk/load-xm.lisp @@ -26,12 +26,11 @@ #+dlfcn (progn - (defvar sys::*toolkit-shared* nil) + (defvar sys::*toolkit-static* nil) (unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea") :note-shared-library-references nil) - (load "clim2:;climxm.so") - (setq sys::*toolkit-shared* t))) + (load "clim2:;climxm.so"))) #-dlfcn (progn diff --git a/tk/xm-defs.lisp b/tk/xm-defs.lisp index 4dd083d0d74e71b0e516f5541d7cac8efb276485..dd2ea58f4d83c9b70e62c7917e27fe1e06d278b8 100644 --- a/tk/xm-defs.lisp +++ b/tk/xm-defs.lisp @@ -1,7 +1,7 @@ ;; -*- mode: common-lisp; package: tk -*- ;; ;; -[]- -;; +;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. ;; @@ -70,9 +70,8 @@ (selected-item-count :int) (selected-item-positions * :int) (selection-type :int)) - + (def-c-type (xm-selected-position-array :no-defuns) 1 :int) (def-c-type (xm-string-table :no-defuns) 1 * :char) -(defconstant xm-font-list-default-tag "FONTLIST_DEFAULT_TAG_STRING") diff --git a/tk/xm-font-list.lisp b/tk/xm-font-list.lisp index b4ee2620013215c661008489469df13d2378cfac..9155a77ec2ce4da344437f4dd22688d64a13e748 100644 --- a/tk/xm-font-list.lisp +++ b/tk/xm-font-list.lisp @@ -1,7 +1,7 @@ ;; -*- mode: common-lisp; package: tk -*- ;; ;; -[Fri Dec 16 17:15:52 1994 by duane]- -;; +;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. ;; @@ -45,12 +45,12 @@ (car value)))))) (dolist (font (cdr value)) (setq font-list - (xm_font_list_append_entry font-list + (xm_font_list_append_entry font-list (note-malloced-object (xm_font_list_entry_create "" xm-font-is-font font))))) - (note-malloced-object font-list + (note-malloced-object font-list #'free-font-list))) #+:dec3100 @@ -74,8 +74,8 @@ (when (zerop entry) (return nil)) (setf (aref type 0) 0) - (push (list - xm_string_default_char_set + (push (list + "" (let ((font (xm_font_list_entry_get_font entry type))) (assert (= (aref type 0) 0)) (intern-object-address diff --git a/tk/xm-init.lisp b/tk/xm-init.lisp index 5ca2d3ccd9e672457be937ec9f683b8b6041b3fd..1550217a9d22fed76147ccc92bd9feaa2d5fa61b 100644 --- a/tk/xm-init.lisp +++ b/tk/xm-init.lisp @@ -35,12 +35,13 @@ +#+dlfcn +(defun reinitialize-toolkit () + (xt_toolkit_initialize) + (setup-error-handlers) + (fixup-class-entry-points)) #+dlfcn -(when sys::*toolkit-shared* - (defun reinitialize-toolkit () - (xt_toolkit_initialize) - (setup-error-handlers) - (fixup-class-entry-points)) +(unless sys::*toolkit-static* (push '(:eval reinitialize-toolkit) excl::*restart-actions*)) diff --git a/tk/xm-widgets.lisp b/tk/xm-widgets.lisp index eafebf0817376f4ad0d78a3f32187b8dddca1a34..c0d2f8dadb6eb7b7cf1f0e6409ef8afa639832ee 100644 --- a/tk/xm-widgets.lisp +++ b/tk/xm-widgets.lisp @@ -83,6 +83,8 @@ ;; when you merge in the ICS version of this make sure you don't break ;; the rs6k - see patch3344.cl +(defconstant xm-font-list-default-tag "FONTLIST_DEFAULT_TAG_STRING") + (defmethod convert-resource-in ((parent t) (type (eql 'xm-string)) value) (and (not (zerop value)) (with-ref-par ((string 0)) diff --git a/utils/excl-verification.lisp b/utils/excl-verification.lisp index 1ace63464c3c0b4264a22b43b8bb63b28f04fdb1..5c03f48818a51a0f6118909aeb8e4c333d974ac6 100644 --- a/utils/excl-verification.lisp +++ b/utils/excl-verification.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SYS; Base: 10; Lowercase: Yes -*- ;; ;; -[Tue Apr 27 18:31:42 1993 by layer]- -;; +;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. ;; @@ -20,7 +20,7 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: excl-verification.lisp,v 1.16 93/04/28 17:19:31 layer Exp $ +;; $Header: /repo/cvs.copy/clim2/utils/excl-verification.lisp,v 1.19 1995/06/21 21:24:34 georgej Exp $ (in-package :sys) @@ -31,7 +31,7 @@ (eval-when (compile load eval) (pushnew :clim *features*) (pushnew :clim-2 *features*) - (pushnew :clim-2.0 *features*) + (pushnew :clim-2.1 *features*) (pushnew :silica *features*) (pushnew :ansi-90 *features*)) @@ -48,7 +48,7 @@ (find-symbol (string '*patches*) patch-package))) (patches (and patches-symbol (symbol-value patches-symbol))) (needed-patches '(26. 27. 46. 50.)) - (dont-have (remove-if + (dont-have (remove-if #'(lambda (pn) (assoc pn patches)) needed-patches))) @@ -58,8 +58,8 @@ You do not have patches ~{~S ~}" needed-patches dont-have))) -(defvar *clim-version* - '("CLIM 2.0" - "$fiHeader: excl-verification.lisp,v 1.16 93/04/28 17:19:31 layer Exp $")) +(defvar *clim-version* + '("CLIM 2.1.alpha" + "$Header: /repo/cvs.copy/clim2/utils/excl-verification.lisp,v 1.19 1995/06/21 21:24:34 georgej Exp $")) (si::rcsnote (first *clim-version*) (second *clim-version*))