[Openmcl-cvs-notifications] r13073 - in /release/1.4/source: contrib/foy/list-definitions-cm/ contrib/foy/list-definitions/ contrib/foy/syntax-styling/ contrib/foy/window-parking-cm/ lisp-kernel/darwinx8632/ lisp-kernel/darwinx8664/
rme at clozure.com
rme at clozure.com
Wed Oct 21 20:55:33 EDT 2009
Author: rme
Date: Wed Oct 21 20:55:33 2009
New Revision: 13073
Log:
Merge trunk changes r13036 through r13047
Added:
release/1.4/source/contrib/foy/syntax-styling/
- copied from r13047, trunk/source/contrib/foy/syntax-styling/
Modified:
release/1.4/source/contrib/foy/list-definitions-cm/history-lists.lisp
release/1.4/source/contrib/foy/list-definitions/history-lists.lisp
release/1.4/source/contrib/foy/window-parking-cm/window-parking.lisp
release/1.4/source/lisp-kernel/darwinx8632/Makefile
release/1.4/source/lisp-kernel/darwinx8664/Makefile
Modified: release/1.4/source/contrib/foy/list-definitions-cm/history-lists.=
lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/contrib/foy/list-definitions-cm/history-lists.lisp (=
original)
+++ release/1.4/source/contrib/foy/list-definitions-cm/history-lists.lisp W=
ed Oct 21 20:55:33 2009
@@ -470,14 +470,27 @@
=
;;; ----------------------------------------------------------------------=
------
;;; File History Interface:
-;;; =
-(objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
+;;;
+;;; *** Instead of doing all this stuff need the equivalent of:
+;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
+#-syntax-styling =
+(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
(let* ((path (cmenu:window-path w))
(name (when (and path (string-equal (pathname-type path) "lisp"))
(concatenate 'string (pathname-name path) ".lisp"))))
(when (and name path)
- (maybe-add-history-entry *file-history-list* name path))
- (call-next-method)))
+ (maybe-add-history-entry *file-history-list* name path)))
+ (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-packag=
e :sax))))
+ (when become-key-function (funcall become-key-function w)))
+ (call-next-method))
+
+#+syntax-styling
+(defMethod become-key-window ((w gui::hemlock-frame))
+ (let* ((path (cmenu:window-path w))
+ (name (when (and path (string-equal (pathname-type path) "lisp"))
+ (concatenate 'string (pathname-name path) ".lisp"))))
+ (when (and name path)
+ (maybe-add-history-entry *file-history-list* name path))))
=
;;; ----------------------------------------------------------------------=
------
;;; Position History Interface:
Modified: release/1.4/source/contrib/foy/list-definitions/history-lists.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/contrib/foy/list-definitions/history-lists.lisp (ori=
ginal)
+++ release/1.4/source/contrib/foy/list-definitions/history-lists.lisp Wed =
Oct 21 20:55:33 2009
@@ -475,14 +475,27 @@
=
;;; ----------------------------------------------------------------------=
------
;;; File History Interface:
-;;; =
-(objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
- (let* ((path (window-path w))
+;;;
+;;; *** Instead of doing all this stuff need the equivalent of:
+;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
+#-syntax-styling =
+(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
+ (let* ((path (cmenu:window-path w))
(name (when (and path (string-equal (pathname-type path) "lisp"))
(concatenate 'string (pathname-name path) ".lisp"))))
(when (and name path)
- (maybe-add-history-entry *file-history-list* name path))
- (call-next-method)))
+ (maybe-add-history-entry *file-history-list* name path)))
+ (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-packag=
e :sax))))
+ (when become-key-function (funcall become-key-function w)))
+ (call-next-method))
+
+#+syntax-styling
+(defMethod become-key-window ((w gui::hemlock-frame))
+ (let* ((path (cmenu:window-path w))
+ (name (when (and path (string-equal (pathname-type path) "lisp"))
+ (concatenate 'string (pathname-name path) ".lisp"))))
+ (when (and name path)
+ (maybe-add-history-entry *file-history-list* name path))))
=
;;; ----------------------------------------------------------------------=
------
;;; Position History Interface:
Modified: release/1.4/source/contrib/foy/window-parking-cm/window-parking.l=
isp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/contrib/foy/window-parking-cm/window-parking.lisp (o=
riginal)
+++ release/1.4/source/contrib/foy/window-parking-cm/window-parking.lisp We=
d Oct 21 20:55:33 2009
@@ -28,6 +28,7 @@
=
(defparameter *window-parker* nil "The window-parker instance.")
(defparameter *window-parking-menu* nil "The window-parking-menu instance.=
")
+(defParameter *park-p* t "To park or not to park.")
=
;;; ----------------------------------------------------------------------=
------
;;;
@@ -245,7 +246,13 @@
(init-parking window)
(ns:with-ns-rect (r (ps-h-position ps) (ps-v-position ps) (ps-h-dimens=
ion ps) (ps-v-dimension ps))
(#/setFrame:display: window r t))
- (#/makeKeyAndOrderFront: window nil)))
+ (#/makeKeyAndOrderFront: window nil))
+ (let ((style-screen-function (find-symbol "STYLE-SCREEN" (find-package :=
sax))))
+ (when style-screen-function
+ (let* ((hemlock-view (gui::hemlock-view window))
+ (text-view (gui::text-pane-text-view (hi::hemlock-view-pane h=
emlock-view))))
+ (when text-view
+ (funcall style-screen-function text-view))))))
=
;;; ----------------------------------------------------------------------=
------
;;;
@@ -259,7 +266,7 @@
(setf *window-parker* (make-instance 'window-parker))
=
(defMethod park ((wp window-parker) (window parkable-hemlock-frame))
- (when (wp-parking-spots wp)
+ (when (and (wp-parking-spots wp) *park-p*)
;; Already parked?
(let* ((position (position window (wp-parking-spots wp) :key #'ps-tena=
nt))
spot)
@@ -371,31 +378,32 @@
;;; Move WINDOW to the parking-spot corresponding to the pressed function =
key,
;;; unless the parking-spot is not on screen or the window is already in t=
hat location.
(defMethod move-window-to-position ((wp window-parker) window function-key)
- (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'ps-=
function-key))
- (tenant (when parking-spot (ps-tenant parking-spot))))
- (cond ((and parking-spot (parking-spot-on-screen-p parking-spot window=
))
- (cond (tenant
- (cond ((eql window tenant)
- (cmenu:echo-msg "Already in parking-spot ~a." fun=
ction-key))
- (t
- (cond ((modified-p tenant)
- (cmenu:notify (format nil "First save: ~S.=
Then try again." =
- (cmenu:window-path t=
enant)))
- (init-parking tenant))
- (t
- (vacate-current-location wp window)
- (bump-location-and-set-location-values wp =
parking-spot window)
- (#/makeKeyAndOrderFront: window nil)
- (cmenu:echo-msg "Moved to parking-spot ~a.=
" function-key))))))
- (t =
- (vacate-current-location wp window)
- (apply-parking-spot-values parking-spot window)
- (#/makeKeyAndOrderFront: window nil)
- (cmenu:echo-msg "Moved to parking-spot ~a." function-key=
))))
- (t
- (if (null parking-spot)
- (cmenu:notify (format nil "Parking-spot ~a is not defined." f=
unction-key))
- (cmenu:notify (format nil "Parking-spot ~a is off screen." fu=
nction-key)))))))
+ (when *park-p*
+ (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'p=
s-function-key))
+ (tenant (when parking-spot (ps-tenant parking-spot))))
+ (cond ((and parking-spot (parking-spot-on-screen-p parking-spot wind=
ow))
+ (cond (tenant
+ (cond ((eql window tenant)
+ (cmenu:echo-msg "Already in parking-spot ~a." f=
unction-key))
+ (t
+ (cond ((modified-p tenant)
+ (cmenu:notify (format nil "First save: ~=
S. Then try again." =
+ (cmenu:window-path=
tenant)))
+ (init-parking tenant))
+ (t
+ (vacate-current-location wp window)
+ (bump-location-and-set-location-values w=
p parking-spot window)
+ (#/makeKeyAndOrderFront: window nil)
+ (cmenu:echo-msg "Moved to parking-spot ~=
a." function-key))))))
+ (t =
+ (vacate-current-location wp window)
+ (apply-parking-spot-values parking-spot window)
+ (#/makeKeyAndOrderFront: window nil)
+ (cmenu:echo-msg "Moved to parking-spot ~a." function-k=
ey))))
+ (t
+ (if (null parking-spot)
+ (cmenu:notify (format nil "Parking-spot ~a is not defined."=
function-key))
+ (cmenu:notify (format nil "Parking-spot ~a is off screen." =
function-key))))))))
=
;;; ----------------------------------------------------------------------=
------
;;; file I/O
Modified: release/1.4/source/lisp-kernel/darwinx8632/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/lisp-kernel/darwinx8632/Makefile (original)
+++ release/1.4/source/lisp-kernel/darwinx8632/Makefile Wed Oct 21 20:55:33=
2009
@@ -69,7 +69,7 @@
=
OSLIBS =3D $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
=
-../../dx86cl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
+../../dx86cl: tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
$(LD) $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
=
=
@@ -94,3 +94,9 @@
strip: ../../dx86cl
strip -s retain ../../dx86cl
=
+.PHONY: tiger-sdk-check
+tiger-sdk-check:
+ @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
+ (echo "*** Install Xcode 10.4 support"; exit 1)
+
+
Modified: release/1.4/source/lisp-kernel/darwinx8664/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/lisp-kernel/darwinx8664/Makefile (original)
+++ release/1.4/source/lisp-kernel/darwinx8664/Makefile Wed Oct 21 20:55:33=
2009
@@ -92,7 +92,7 @@
=
OSLIBS =3D $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
=
-../../dx86cl64: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
+../../dx86cl64: tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefi=
le
$(LD) $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
=
=
@@ -114,3 +114,9 @@
=
strip: ../../dx86cl64
strip -s retain ../../dx86cl64
+
+.PHONY: tiger-sdk-check
+tiger-sdk-check:
+ @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
+ (echo "*** Install Xcode 10.4 support"; exit 1)
+
More information about the Openmcl-cvs-notifications
mailing list