Update of /project/clim-desktop/cvsroot/clim-desktop In directory clnet:/tmp/cvs-serv17645

Modified Files: climacs.lisp clim-launcher.lisp clim-desktop.asd beirc.lisp Added Files: closure.lisp clim-desktop-minimal.asd Removed Files: swine-cmds.lisp misc.lisp Log Message: Added a CLIM-DESKTOP-MINIMAL system for people who are not interested in Beirc or Clouseau. Also removed some unused files and moved a few things around.

--- /project/clim-desktop/cvsroot/clim-desktop/climacs.lisp 2006/07/05 14:14:38 1.13 +++ /project/clim-desktop/cvsroot/clim-desktop/climacs.lisp 2006/07/10 22:14:19 1.14 @@ -1,9 +1,5 @@ (in-package :climacs-gui)

-(define-command (com-browse-url :name t :command-table base-table) () - (let ((url (accept 'url :prompt "Browse URL"))) - (closure:visit url))) - (define-command (com-inspect-buffer :name "Inspect Buffer" :command-table base-table) () (clouseau:inspector (buffer (current-window))))

@@ -171,3 +167,19 @@ :documentation "Edit File") (object) (list object)) + +;; Translator for clicky goodness in Lisp Syntax: + +(define-command (com-inspect-symbol :name t :command-table climacs-lisp-syntax::lisp-table) + ((symbol 'symbol :prompt "Inspect symbol")) + (clouseau:inspector symbol :new-process t)) + +(define-presentation-to-command-translator inspect-symbol + (symbol com-inspect-symbol climacs-lisp-syntax::lisp-table + :gesture :inspect + :tester ((object presentation) + (declare (ignore object)) + (not (eq (presentation-type presentation) 'climacs-lisp-syntax::unknown-symbol))) + :documentation "Inspect") + (object) + (list object)) --- /project/clim-desktop/cvsroot/clim-desktop/clim-launcher.lisp 2006/06/06 13:46:58 1.3 +++ /project/clim-desktop/cvsroot/clim-desktop/clim-launcher.lisp 2006/07/10 22:14:19 1.4 @@ -1,9 +1,5 @@ ;; -*- Mode: lisp -*-

-;;(asdf:oos 'asdf:load-op :mcclim) -;;(asdf:oos 'asdf:load-op :clim-listener) -;;(asdf:oos 'asdf:load-op :climacs) - (in-package :clim-launcher)

(define-application-frame launcher () @@ -21,6 +17,8 @@ ((name :initarg :name :accessor name :initform "") (entry :initarg :entry :accessor entry :initform (lambda (x) (format t "~A was called~%" x)))))

+(define-presentation-type clim-app ()) + (defmethod display-commands ((frame launcher) stream) (loop for app being the hash-values of *apps* do (present app 'clim-app :stream stream))) @@ -70,8 +68,6 @@ (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)))

@@ -82,7 +78,7 @@

;; Get some support for launching apps into the CLIM Listener:

-(defmethod display-commands ((frame clim-listener::listener) stream) +(defmethod display-applications ((frame clim-listener::listener) stream) (loop for app being the hash-values of *apps* do (present app 'clim-app :stream stream)))

@@ -91,7 +87,7 @@ :command-table clim-listener::show-commands :menu t) () - (display-commands *application-frame* (frame-standard-output *application-frame*))) + (display-applications *application-frame* (frame-standard-output *application-frame*)))

(define-command (com-launch-application :name t --- /project/clim-desktop/cvsroot/clim-desktop/clim-desktop.asd 2006/07/05 14:05:01 1.5 +++ /project/clim-desktop/cvsroot/clim-desktop/clim-desktop.asd 2006/07/10 22:14:19 1.6 @@ -6,9 +6,8 @@

(in-package :clim-desktop-system)

-(defsystem "clim-desktop" - :depends-on (:swank - :mcclim +(defsystem :clim-desktop + :depends-on (:mcclim :split-sequence :cl-ppcre :clim-listener @@ -16,18 +15,18 @@ :closure :clouseau :climacs) - :description "clim-desktop" - :version "0" + :description "System providing integration between a range of CLIM +applications." + :version "0.2" :author "Dwight Holman" :licence "" :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" :depends-on ("swine-cmds")) + (:file "beirc" :depends-on ("clim-launcher")) + (:file "closure" :depends-on ("beirc" "clim-launcher" "clhs-lookup")) + (:file "climacs" :depends-on ("EDITME")) (:file "debugger" :depends-on ("EDITME")) (:file "listener") - (:file "clim-launcher" :depends-on ("packages")) - (:file "swine-cmds" :depends-on ("clhs-lookup" "debugger")))) + (:file "clim-launcher" :depends-on ("packages")))) --- /project/clim-desktop/cvsroot/clim-desktop/beirc.lisp 2006/06/01 23:02:22 1.2 +++ /project/clim-desktop/cvsroot/clim-desktop/beirc.lisp 2006/07/10 22:14:19 1.3 @@ -1,7 +1,6 @@ (in-package :beirc)

-(define-beirc-command (com-browse-url :name t) ((url 'url :prompt "url")) - (closure:visit url)) +(clim-launcher:add-app "Beirc" 'beirc:beirc)

(define-beirc-command (com-edit-user-init-file :name t) ()

--- /project/clim-desktop/cvsroot/clim-desktop/closure.lisp 2006/07/10 22:14:19 NONE +++ /project/clim-desktop/cvsroot/clim-desktop/closure.lisp 2006/07/10 22:14:19 1.1 ;;; -*- Mode: Lisp; Package: CLIM-DESKTOP; -*-

;;; (c) copyright 2005-2006 by ;;; Robert Strandh (strandh@labri.fr) ;;; David Murray (splittist@yahoo.com) ;;; Troels Henriksen (athas@sigkill.dk)

;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public ;;; License as published by the Free Software Foundation; either ;;; version 2 of the License, or (at your option) any later version. ;;; ;;; This library is distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; Library General Public License for more details. ;;; ;;; You should have received a copy of the GNU Library General Public ;;; License along with this library; if not, write to the ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;;; Boston, MA 02111-1307 USA.

;;; Try to integrate Closure with some CLIM applications...

(clim-launcher:add-app "Closure" 'closure:start)

(in-package :climacs-gui)

(define-command (com-browse-url :name t :command-table base-table) () (let ((url (accept 'url :prompt "Browse URL"))) (closure:visit url)))

(in-package :climacs-lisp-syntax)

(define-command (com-hyperspec-lookup :name t :command-table lisp-table) () "Look up a symbol in the Common Lisp HyperSpec." (let* ((name (or (symbol-name-at-mark (point (current-window)) (syntax (buffer (current-window)))) (accept 'string :prompt "Hyperspec lookup for symbol"))) (*standard-output* *debug-io*) (url (clhs-lookup:spec-lookup name))) (if (null url) (esa:display-message "Symbol not found.") (closure:visit url))))

(esa:set-key 'com-hyperspec-lookup 'lisp-table '((#\c :control) (#\d :control) (#\h)))

(in-package :beirc)

(define-beirc-command (com-browse-url :name t) ((url 'url :prompt "url")) (closure:visit url))--- /project/clim-desktop/cvsroot/clim-desktop/clim-desktop-minimal.asd 2006/07/10 22:14:19 NONE +++ /project/clim-desktop/cvsroot/clim-desktop/clim-desktop-minimal.asd 2006/07/10 22:14:19 1.1 ;; -*- Mode: Lisp -*-

(cl:defpackage :clim-desktop-minimal-system (:use :common-lisp :asdf))

(in-package :clim-desktop-minimal-system)

(defsystem :clim-desktop-minimal :depends-on (:mcclim :split-sequence :cl-ppcre :clim-listener :clouseau :climacs) :description "Minimal CLIM Desktop without Beirc and Closure (IRC client and webbrowser)." :version "0.2" :author "Dwight Holman" :licence "" :components ((:file "packages") (:file "EDITME" :depends-on ("packages")) (:file "abbrev" :depends-on ("packages")) (:file "climacs" :depends-on ("packages")) (:file "debugger" :depends-on ("EDITME")) (:file "listener") (:file "clim-launcher" :depends-on ("packages" "EDITME"))))