Changeset 15255

Timestamp:

Mar 17, 2012, 8:25:31 PM (13 years ago)

Author:

R. Matthew Emerson

Message:

Avoid buffer name conflicts by resetting *cocoa-listener-count*
only when there are no other listener windows.

File:

• trunk/source/cocoa-ide/cocoa-listener.lisp (modified) (3 diffs)

trunk/source/cocoa-ide/cocoa-listener.lisp

@@ -427 +427 @@
   nil)
 
-
+(defun listener-window-count ()
+  (let ((count 0)
+        (all-windows (#/windows *NSApp*)))
+    (dotimes (i (#/count all-windows) count)
+      (let* ((w (#/objectAtIndex: all-windows i))
+             (wc (#/windowController w)))
+        (when (typep wc 'hemlock-listener-window-controller)
+          (incf count))))))
 
 (objc:defmethod #/init ((self hemlock-listener-document))
@@ -443 +450 @@
     doc))
 
-(def-cocoa-default *initial-listener-x-pos* :float -100.0f0 "X position of upper-left corner of initial listener")
+(def-cocoa-default *initial-listener-x-pos* :float 100.0f0 "X position of upper-left corner of initial listener")
 
 (def-cocoa-default *initial-listener-y-pos* :float 100.0f0 "Y position of upper-left corner of initial listener")
@@ -451 +458 @@
 
 (objc:defmethod (#/dealloc :void) ((self hemlock-listener-document))
-  (if (zerop (decf *cocoa-listener-count*))
+  (when (zerop (listener-window-count))
     (setq *next-listener-x-pos* nil
-          *next-listener-y-pos* nil))
+          *next-listener-y-pos* nil
+          *cocoa-listener-count* 0))
   (let* ((p (hemlock-document-process self)))
     (when p