[clim-desktop-cvs] CVS clim-desktop
thenriksen
thenriksen at common-lisp.net
Thu Mar 30 10:33:55 UTC 2006
Update of /project/clim-desktop/cvsroot/clim-desktop
In directory clnet:/tmp/cvs-serv14409
Modified Files:
debugger.lisp climfigurator.lisp clim-lookup.lisp
clim-launcher.lisp clim-desktop.asd clhs-lookup.lisp
class-browser.lisp abbrev.lisp EDITME.lisp
Added Files:
packages.lisp
Log Message:
Changed package-specific stuff to use packages.lisp.
--- /project/clim-desktop/cvsroot/clim-desktop/debugger.lisp 2006/01/06 03:15:46 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/debugger.lisp 2006/03/30 10:33:55 1.2
@@ -1,5 +1,4 @@
(in-package :common-lisp-user)
-(load "/home/pimaniac/lisp/common/cvs/mcclim/Apps/Debugger/clim-debugger.lisp")
#+sbcl (setf *debugger-hook* #'clim-debugger:debugger)
#+cmucl (setf *debug-hook* #'clim-debugger:debugger)
--- /project/clim-desktop/cvsroot/clim-desktop/climfigurator.lisp 2006/01/06 03:15:46 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/climfigurator.lisp 2006/03/30 10:33:55 1.2
@@ -4,12 +4,6 @@
;;(asdf:oos 'asdf:load-op :clim-listener)
;;(asdf:oos 'asdf:load-op :climacs)
-
-(in-package :common-lisp-user)
-(defpackage :climfigurator
- (:use :common-lisp :clim)
- (:shadowing-import-from :clim-lisp-patch :interactive-stream-p))
-
(in-package :climfigurator)
(define-application-frame config ()
--- /project/clim-desktop/cvsroot/clim-desktop/clim-lookup.lisp 2006/01/06 03:15:46 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/clim-lookup.lisp 2006/03/30 10:33:55 1.2
@@ -29,8 +29,6 @@
;; Brian Mastenbrook, bmastenb at indiana.edu
-(defpackage :clim-lookup (:use :common-lisp :split-sequence)
- (:export :term-lookup :populate-table))
(in-package :clim-lookup)
(defvar *clim-table*)
--- /project/clim-desktop/cvsroot/clim-desktop/clim-launcher.lisp 2006/01/06 03:15:45 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/clim-launcher.lisp 2006/03/30 10:33:55 1.2
@@ -5,10 +5,6 @@
;;(asdf:oos 'asdf:load-op :climacs)
-(in-package :common-lisp-user)
-(defpackage :clim-launcher
- (:use :common-lisp :clim)
- (:shadowing-import-from :clim-lisp-patch :interactive-stream-p))
(in-package :clim-launcher)
@@ -21,40 +17,67 @@
(:layouts
(defaults application)))
-(defvar *apps* '())
+(defvar *apps* (make-hash-table :test 'equal))
(defclass clim-app ()
((name :initarg :name :accessor name :initform "")
(entry :initarg :entry :accessor entry :initform (lambda (x) (format t "~A was called~%" x)))))
(defmethod display-commands ((frame launcher) stream)
- (loop for app in *apps*
+ (loop for app being the hash-values of *apps*
do (present app 'clim-app :stream stream)))
(define-presentation-method present
(app (type clim-app) stream (view textual-view) &key)
(format stream "~A~%" (name app)))
+(define-launcher-command (com-refresh-list
+ :menu t)
+ ()
+ (redisplay-frame-panes *application-frame*))
+
(define-launcher-command
com-launch-app
((appl 'clim-app))
- (funcall (entry appl)))
+ ;; SBCL doesn't keep dynamic bindings from the parent thread when
+ ;; invoking a new thread, so we'll have to create the threads and
+ ;; the bindings ourselves.
+ (flet ((run ()
+ (let #+sbcl ((sb-ext:*invoke-debugger-hook* #'clim-debugger:debugger)
+ (*debugger-hook* #'clim-debugger:debugger))
+ #-sbcl nil
+ (funcall (entry appl)))))
+ (clim-sys:make-process #'run :name (name appl))))
+
+(define-launcher-command (com-remove-app)
+ ((appl 'clim-app))
+ ;; Remove from list.
+ (remhash (name appl) *apps*)
+ (redisplay-frame-panes *application-frame*))
(defun add-app (name entry)
- (push (make-instance 'clim-app :name name :entry entry) *apps*))
+ (setf (gethash name *apps*)
+ (make-instance 'clim-app :name name :entry entry)))
(define-presentation-to-command-translator launch-app
(clim-app com-launch-app launcher
- :gesture :select)
+ :gesture :select
+ :documentation "Launch application")
(object) (list object))
-(add-app "listener" (lambda () (clim-listener:run-listener :new-process t)))
-(add-app "closure" #'closure:start)
-(add-app "beirc" #'beirc:beirc)
-(add-app "climacs" (lambda () (climacs-gui::climacs :new-process t)))
+(define-presentation-to-command-translator remove-app
+ (clim-app com-remove-app launcher
+ :gesture :delete
+ :documentation "Remove application")
+ (object) (list object))
+(add-app "Listener" (lambda () (clim-listener:run-listener)))
+(add-app "Closure" 'closure:start)
+(add-app "Beirc" 'beirc:beirc)
+(add-app "Climacs" (lambda () (climacs-gui::climacs)))
+(add-app "Climacs (RV)" (lambda () (climacs-gui::climacs-rv)))
(defun start ()
+ "Start the CLIM Launcher program."
#+:cmucl (multiprocessing::startup-idle-and-top-level-loops)
- (run-frame-top-level (make-application-frame 'clim-launcher::launcher)))
-
+ (run-frame-top-level (make-application-frame 'clim-launcher::launcher)))
\ No newline at end of file
--- /project/clim-desktop/cvsroot/clim-desktop/clim-desktop.asd 2006/03/18 00:09:18 1.2
+++ /project/clim-desktop/cvsroot/clim-desktop/clim-desktop.asd 2006/03/30 10:33:55 1.3
@@ -1,6 +1,6 @@
;; -*- Mode: Lisp -*-
-(defpackage :clim-desktop-system
+(cl:defpackage :clim-desktop-system
(:use :common-lisp
:asdf))
@@ -20,15 +20,15 @@
:version "0"
:author "Dwight Holman"
:licence ""
- :components ((:file "package")
- (:file "EDITME")
- (:file "abbrev")
+ :components ((:file "packages")
+ (:file "EDITME" :depends-on ("packages"))
+ (:file "abbrev" :depends-on ("packages"))
(:file "clhs-lookup" :depends-on ("abbrev"))
(:file "misc")
(:file "beirc")
(:file "climacs")
(:file "debugger" :depends-on ("EDITME"))
(:file "listener")
- (:file "clim-launcher")
+ (:file "clim-launcher" :depends-on ("packages"))
(:file "swine")
- (:file "swine-cmds" :depends-on ("clhs-lookup" "debugger"))))
+ (:file "swine-cmds" :depends-on ("swine" "clhs-lookup" "debugger"))))
--- /project/clim-desktop/cvsroot/clim-desktop/clhs-lookup.lisp 2006/03/18 00:09:18 1.2
+++ /project/clim-desktop/cvsroot/clim-desktop/clhs-lookup.lisp 2006/03/30 10:33:55 1.3
@@ -24,9 +24,6 @@
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-(defpackage :clhs-lookup (:use :common-lisp) (:export :symbol-lookup
- :populate-table
- :spec-lookup))
(in-package :clhs-lookup)
(defparameter *hyperspec-pathname*
--- /project/clim-desktop/cvsroot/clim-desktop/class-browser.lisp 2006/01/06 03:15:46 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/class-browser.lisp 2006/03/30 10:33:55 1.2
@@ -31,9 +31,6 @@
;; Note: Don't try with a non PCL-based CLOS.
;; After loading try calling (clim-class-browser::class-browser)
-(defpackage :clim-class-browser
- (:use :clim :clim-lisp))
-
(in-package :clim-class-browser)
(define-application-frame class-browser ()
--- /project/clim-desktop/cvsroot/clim-desktop/abbrev.lisp 2006/01/06 03:15:45 1.1.1.1
+++ /project/clim-desktop/cvsroot/clim-desktop/abbrev.lisp 2006/03/30 10:33:55 1.2
@@ -23,10 +23,6 @@
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-(in-package :common-lisp-user)
-(defpackage :abbrev (:use :cl :split-sequence)
- (:export :abbrev))
(in-package :abbrev)
(defun could-be-wrap (term char-set)
--- /project/clim-desktop/cvsroot/clim-desktop/EDITME.lisp 2006/03/18 00:09:18 1.4
+++ /project/clim-desktop/cvsroot/clim-desktop/EDITME.lisp 2006/03/30 10:33:55 1.5
@@ -4,10 +4,10 @@
(defparameter *mcclim-directory*
(asdf:component-pathname (asdf:find-system "mcclim")))
-(defparameter *hyperspec-root*
+(defparameter clhs-lookup::*hyperspec-root*
"http://www.lispworks.com/reference/HyperSpec/")
-(defparameter *mop-root* "http://www.alu.org/mop/")
+(defparameter clhs-lookup::*mop-root* "http://www.alu.org/mop/")
;;; LOAD THE CLIM DEBUGGER
(load (merge-pathnames "Apps/Debugger/clim-debugger.lisp" *mcclim-directory*))
--- /project/clim-desktop/cvsroot/clim-desktop/packages.lisp 2006/03/30 10:33:55 NONE
+++ /project/clim-desktop/cvsroot/clim-desktop/packages.lisp 2006/03/30 10:33:55 1.1
(cl:defpackage :clim-desktop
(:use :common-lisp
:asdf))
(cl:defpackage :clhs-lookup
(:use :common-lisp)
(:export :symbol-lookup
:populate-table
:spec-lookup))
(cl:defpackage :abbrev
(:use :cl :split-sequence)
(:export :abbrev))
(cl:defpackage :clim-launcher
(:use :common-lisp :clim)
(:shadowing-import-from :clim-lisp-patch :interactive-stream-p)
(:export :start :add-app))
(cl:defpackage :climfigurator
(:use :common-lisp :clim)
(:shadowing-import-from :clim-lisp-patch :interactive-stream-p))
(cl:defpackage :clim-lookup
(:use :common-lisp :split-sequence)
(:export :term-lookup :populate-table))
(cl:defpackage :clim-class-browser
(:use :clim :clim-lisp))
More information about the Clim-desktop-cvs
mailing list