Changeset 12782

Timestamp:

Sep 8, 2009, 1:27:21 PM (10 years ago)

Author:

gfoy

Message:

Miscellaneous.

Location:

trunk/source/contrib/foy/list-definitions-cm

Files:

• ReadMe.rtf (modified) (previous)
• history-lists.lisp (modified) (7 diffs)
• list-definitions.lisp (modified) (5 diffs)

trunk/source/contrib/foy/list-definitions-cm/history-lists.lisp

@@ -32 +32 @@
 (defParameter *file-history-list-length* 25)
 
-(export '(notify))
-
-;;; This includes a work-around for what appears to be a bug in the hemlock-frame
-;;; #/close method.  After a #/close, the window remains on the (#/orderedWindows *NSApp*)
-;;; list, but (hi::buffer-document buffer) in NIL.  Therefore the extra tests:
-(defun window-with-path (path)
-  "If a window with PATH is open, return it."
-  (gui::first-window-satisfying-predicate 
-   #'(lambda (w)
-       (when (and (typep w 'gui::hemlock-frame)
-                  (not (typep w 'gui::hemlock-listener-frame)))
-         (let* ((pane (slot-value w 'gui::pane))
-                (text-view (gui::text-pane-text-view pane))
-                (buffer (gui::hemlock-buffer text-view))
-                (document (when buffer (hi::buffer-document buffer)))
-                (p (hi::buffer-pathname buffer)))
-           (when (and document p) (string-equal path p)))))))
-
 (defun maybe-open-file (path)
   "If a window with PATH is open, return it.  Otherwise open a new window."
-  (let ((w (window-with-path path)))
+  (let ((w (cmenu:window-with-path path)))
     (if w 
       w
@@ -65 +47 @@
                      (hemlock::user-homedir-pathname)))
 
-(defun notify (message)
-  "FYI"
-  (gui::alert-window :title "Notification" :message message))
 
 ;;; ----------------------------------------------------------------------------
@@ -86 +65 @@
   (let* ((name (hle-name entry))
          (path (hle-path entry))
-         (window (window-with-path path))
+         (window (cmenu:window-with-path path))
          mark def-list text-view hemlock-view)
     (unless (probe-file path)
-      (notify (format nil "~a does not exist.  It will be deleted from the history lists."
+      (cmenu:notify (format nil "~a does not exist.  It will be deleted from the history lists."
                       path))
       (purge-file-references *position-history-list* path)
@@ -117 +96 @@
              (move-entry-to-front *file-history-list* path) t)
             (t 
-             (notify (format nil "Cannot find ~S.  It will be deleted from the position history list." 
+             (cmenu:notify (format nil "Cannot find ~S.  It will be deleted from the position history list." 
                              name))
              (remove-entry *position-history-list* name) nil)))))
@@ -130 +109 @@
   (let ((path (hle-path entry)))
     (unless (probe-file path)
-      (notify (format nil "~S does not exist.  It will be deleted from the history lists." path))
+      (cmenu:notify (format nil "~S does not exist.  It will be deleted from the history lists." path))
       (purge-file-references *position-history-list* path)
       (remove-path *file-history-list* path)
       (return-from show-entry nil))
-    (let ((window (window-with-path path))) 
+    (let ((window (cmenu:window-with-path path))) 
       (unless window 
         (let ((hemlock-view (gui::cocoa-edit path)))
@@ -426 +405 @@
 (defMethod read-history-list ((hl history-list) stream &optional position-p)
   (flet ((oops ()
-           (notify (format nil "There is a problem with ~S. Setting the history to NIL." (hl-path hl)))
+           (cmenu:notify (format nil "There is a problem with ~S. Setting the history to NIL." (hl-path hl)))
            (setf (hl-list hl) nil)
            ;;; delete the file?
@@ -494 +473 @@
 ;;; 
 (objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
-  (let* ((path (window-path w))
+  (let* ((path (cmenu:window-path w))
          (name (when (and path (string-equal (pathname-type path) "lisp"))
                  (concatenate 'string (pathname-name path) ".lisp"))))

trunk/source/contrib/foy/list-definitions-cm/list-definitions.lisp

@@ -3 +3 @@
 ;;; ----------------------------------------------------------------------------
 ;;;
-;;;      list-definitionsisp
+;;;      list-definitions.lisp
 ;;;
 ;;;      copyright (c) 2009 Glen Foy
@@ -33 +33 @@
 (require :context-menu-cm)
 
-(export '(find-and-display-definition))
+(export '(find-and-display-definition window-path active-hemlock-window))
 
 (defParameter *objc-defmethod-search-pattern* (hi::new-search-pattern :string-insensitive :forward "(objc:defmethod"))
@@ -45 +45 @@
 
 (defmacro clone (mark) `(hi::copy-mark ,mark :temporary))
-
-(defun active-hemlock-window ()
-  "Return the active hemlock-frame."
-  (gui::first-window-satisfying-predicate 
-   #'(lambda (w)
-       (and (typep w 'gui::hemlock-frame)
-            (not (typep w 'gui::hemlock-listener-frame))
-            (#/isKeyWindow w)))))
-
-(defun window-path (w)
-  "Return the window's path."
-  (let* ((pane (slot-value w 'gui::pane))
-         (hemlock-view (when pane (gui::text-pane-hemlock-view pane)))
-         (buffer (when hemlock-view (hi::hemlock-view-buffer hemlock-view))))
-    (when buffer (hi::buffer-pathname buffer))))
 
 ;;; ----------------------------------------------------------------------------
@@ -149 +134 @@
                  :sub-title (if alpha-p "alphabetical" "positional")
                  :menu-text-view text-view 
-                 :menu-path (window-path (#/window text-view))))
-         (window (active-hemlock-window))
+                 :menu-path (cmenu:window-path (#/window text-view))))
+         (window (cmenu:active-hemlock-window))
          (alist (when window (list-definitions window alpha-p)))
          (class-icon (#/iconForFileType: (#/sharedWorkspace ns:ns-workspace) (ccl::%make-nsstring "lisp")))
@@ -367 +352 @@
 (defun find-and-display-definition (name path)
   "Display the file and scroll to the definition position."
-  (let ((window (window-with-path path))
+  (let ((window (cmenu:window-with-path path))
          mark def-list text-view hemlock-view)
     (unless (probe-file path)
-      (notify (format nil "~a does not exist."
+      (cmenu:notify (format nil "~a does not exist."
                       path))
       (return-from find-and-display-definition nil))