From thenriksen at common-lisp.net Fri Nov 24 15:01:01 2006 From: thenriksen at common-lisp.net (thenriksen) Date: Fri, 24 Nov 2006 10:01:01 -0500 (EST) Subject: [clim-desktop-cvs] CVS clim-desktop Message-ID: <20061124150101.358E62B141@common-lisp.net> Update of /project/clim-desktop/cvsroot/clim-desktop In directory clnet:/tmp/cvs-serv8775 Modified Files: closure.lisp Log Message: CLIMACS-LISP-SYNTAX no longer exists. Also, bugfix moved to Closure. --- /project/clim-desktop/cvsroot/clim-desktop/closure.lisp 2006/07/28 10:56:51 1.3 +++ /project/clim-desktop/cvsroot/clim-desktop/closure.lisp 2006/11/24 15:01:01 1.4 @@ -22,6 +22,8 @@ ;;; Try to integrate Closure with some CLIM applications... +(in-package :clim-desktop) + (clim-launcher:add-app "Closure" 'closure:start) (in-package :climacs-gui) @@ -30,7 +32,7 @@ (let ((url (accept 'url :prompt "Browse URL"))) (closure:visit url))) -(in-package :climacs-lisp-syntax) +(in-package :drei-lisp-syntax) (define-command (com-lookup-symbol-documentation :name t :command-table lisp-table) () @@ -60,46 +62,3 @@ (define-beirc-command (com-browse-url :name t) ((url 'url :prompt "url")) (closure:visit url)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Let's fix bugs in Closure! - -(in-package :netlib) - -(defun http-make-request (method url header post-data) - "Makes a single HTTP request for the URL url; - Returns: io protocol-version response-code response-message response-header." - ;; eval hack - #+NIL - (cond ((string-equal (url:url-host url) "images.cjb.net") - (error "No data from images.cjb.net!"))) - (when *trace-http-p* - (ignore-errors - (format *http-trace-output* "~&;; Making ~S request for ~S ..." method url) - (finish-output *http-trace-output*))) - (let ((host (or (url:url-host url) "localhost"))) - (multiple-value-bind (io proxyp) (open-socket-for-http url) - (let ((method-string (ecase method (:GET "GET") (:POST "POST"))) - (url-for-server (if proxyp - (unparse-url-for-http/proxy url) - (unparse-url-for-http url))) - (header (append (if (and (or *send-host-field-never-the-less-p* - proxyp) - (not (member :host header :test #'string-equal :key #'car))) - ;; FIX: - (if (and (numberp (url:url-port url)) (not (= (url:url-port url) 80))) - (list (cons "Host" (format nil "~A:~A" host (url:url-port url)))) - (list (cons "Host" host))) - nil) - (if *referer* - (list (cons "Referer" (if (url:url-p *referer*) - (url:unparse-url *referer*) - *referer*))) - nil) - (if (eq method :post) - (list (cons "Content-Length" (format nil "~D" (length post-data)))) - nil) - header))) - (multiple-value-bind (protocol-version response-code response-message response-header) - (make-http-request io method-string url-for-server "HTTP/1.0" header post-data) - (values io protocol-version response-code response-message response-header)))))) \ No newline at end of file From thenriksen at common-lisp.net Fri Nov 24 15:01:44 2006 From: thenriksen at common-lisp.net (thenriksen) Date: Fri, 24 Nov 2006 10:01:44 -0500 (EST) Subject: [clim-desktop-cvs] CVS clim-desktop Message-ID: <20061124150144.733502B14B@common-lisp.net> Update of /project/clim-desktop/cvsroot/clim-desktop In directory clnet:/tmp/cvs-serv8856 Modified Files: climacs.lisp Log Message: Drei-ify CLIM-Desktop. --- /project/clim-desktop/cvsroot/clim-desktop/climacs.lisp 2006/08/28 19:56:27 1.16 +++ /project/clim-desktop/cvsroot/clim-desktop/climacs.lisp 2006/11/24 15:01:43 1.17 @@ -1,13 +1,13 @@ (in-package :climacs-commands) (define-command (com-inspect-buffer :name "Inspect Buffer" :command-table base-table) () - (clouseau:inspector (buffer (current-window)))) + (clouseau:inspector *current-buffer*)) (define-command (com-inspect-window :name "Inspect Current Window" :command-table base-table) () - (clouseau:inspector (current-window))) + (clouseau:inspector *current-window*)) (define-command (com-inspect-syntax :name "Inspect Syntax" :command-table base-table) () - (clouseau:inspector (syntax (current-buffer *application-frame*)))) + (clouseau:inspector *current-syntax*)) (set-key 'com-inspect-buffer 'base-table @@ -77,14 +77,14 @@ as well as a class, or as numerous methods), a mouse-click-sensitive list of available definitions will be displayed." - (climacs-lisp-syntax:edit-definition symbol)) + (drei-lisp-syntax:edit-definition symbol)) (define-command (com-edit-definition-of-type :command-table global-climacs-table) ((symbol 'symbol :prompt "Edit symbol") (type 'symbol)) "Edit the definition of a symbol as a given type." - (climacs-lisp-syntax:edit-definition symbol type)) + (drei-lisp-syntax:edit-definition symbol type)) ;; Redefine (ed) (handler-bind ((#+sbcl sb-ext:package-lock-violation @@ -170,16 +170,16 @@ ;; Translator for clicky goodness in Lisp Syntax: -(define-command (com-inspect-symbol :name t :command-table climacs-lisp-syntax::lisp-table) +(define-command (com-inspect-symbol :name t :command-table drei-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 + (symbol com-inspect-symbol drei-lisp-syntax::lisp-table :gesture :inspect :tester ((object presentation) (declare (ignore object)) - (not (eq (presentation-type presentation) 'climacs-lisp-syntax::unknown-symbol))) + (not (eq (presentation-type presentation) 'drei-lisp-syntax::unknown-symbol))) :documentation "Inspect") (object) (list object))