Changeset 14225

Timestamp:

Aug 30, 2010, 8:08:04 AM (14 years ago)

Author:

R. Matthew Emerson

Message:

When launching the IDE, also don't load home:ccl-init if the shift
key is being held down.

See ticket:726.

Location:

trunk/source/cocoa-ide

Files:

• app-delegate.lisp (modified) (1 diff)
• cocoa-utils.lisp (modified) (1 diff)
• start.lisp (modified) (1 diff)

trunk/source/cocoa-ide/app-delegate.lisp

@@ -59 +59 @@
   (declare (ignore notification))
   (initialize-user-interface)
-  (let* ((event (#_CGEventCreate +null-ptr+))
-         (flags (#_CGEventGetFlags event)))
-    (unless (logtest flags #$kCGEventFlagMaskShift)
-      (load-ide-init-file))
-    (#_CFRelease event)))
+  (unless (shift-key-p)
+    (load-ide-init-file)))
 
 (objc:defmethod (#/applicationWillTerminate: :void)

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

@@ -411 +411 @@
     (>= (%get-long p) #x1050)))
 
-
+;; This works even if an event loop is not running.
+#-cocotron
+(defun shift-key-p ()
+  (let* ((event (#_CGEventCreate +null-ptr+))
+         (flags (#_CGEventGetFlags event)))
+    (prog1
+        (logtest flags #$kCGEventFlagMaskShift)
+      (#_CFRelease event))))
+
+#+cocotron
+(defun shift-key-p ()
+  nil)

trunk/source/cocoa-ide/start.lisp

@@ -82 +82 @@
 
 (defmethod ccl::application-init-file ((a cocoa-application))
-  '("home:ccl-init" "home:\\.ccl-init"))
+  (unless (shift-key-p)
+    '("home:ccl-init" "home:\\.ccl-init")))
 
 ;;; If we're launched via the Finder, the only argument we'll