December 2007 - mcclim-cvs@common-lisp.net

[mcclim-cvs] CVS mcclim/Drei
by afuchs 19 Dec '07

19 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv18203 Modified Files: lisp-syntax-swank.lisp Log Message: Use keywords to name modules instead of lower-case strings. Stelian Ionescu again: lc strings mess up the check whether a module is loaded already. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2007/12/19 01:15:31 1.8 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2007/12/19 01:19:26 1.9 @@ -30,8 +30,8 @@ ;; We need these modules loaded. (eval-when (:compile-toplevel :load-toplevel :execute) - (swank:swank-require "swank-c-p-c") - (swank:swank-require "swank-arglists")) + (swank:swank-require :swank-c-p-c) + (swank:swank-require :swank-arglists)) ;; If this file is loaded, make local Swank the default way of ;; interacting with the image.

1 0

[mcclim-cvs] CVS mcclim/Drei
by afuchs 19 Dec '07

19 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv17976/Drei Modified Files: lisp-syntax-swank.lisp Log Message: Change the (load (swank::find-module ...)) forms to use swank-require. Suggested by Stelian Ionescu. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2007/12/11 18:46:27 1.7 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp 2007/12/19 01:15:31 1.8 @@ -30,8 +30,8 @@ ;; We need these modules loaded. (eval-when (:compile-toplevel :load-toplevel :execute) - (load (swank::find-module "swank-c-p-c")) - (load (swank::find-module "swank-arglists"))) + (swank:swank-require "swank-c-p-c") + (swank:swank-require "swank-arglists")) ;; If this file is loaded, make local Swank the default way of ;; interacting with the image.

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle/input
by rschlatte 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/input In directory clnet:/tmp/cvs-serv30166/Backends/beagle/input Modified Files: events.lisp Log Message: Beagle backend fixes * functionality not tested, but it loads under clozure cl snapshot * Patches by Greg Pfeil Signed-off-by: Rudi Schlatte <rudi(a)constantly.at> --- /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp 2006/03/24 11:18:27 1.11 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp 2007/12/18 10:54:21 1.12 @@ -28,7 +28,7 @@ #|| -$Id: events.lisp,v 1.11 2006/03/24 11:18:27 tmoore Exp $ +$Id: events.lisp,v 1.12 2007/12/18 10:54:21 rschlatte Exp $ Events in Cocoa --------------- @@ -162,9 +162,8 @@ ;;; (there is no event process calling process-next-event). #-(and) (defmethod get-next-event ((port beagle-port) &key wait-function (timeout nil)) - (declare (special *mcclim-event-queue* *beagle-port*) + (declare (special *mcclim-event-queue*) (ignore wait-function)) - (setf *beagle-port* port) ; TODO: don't think this <- is needed. ;; When event queue is empty, wait for an event to be posted. (if (eq timeout nil) (ccl:wait-on-semaphore (beagle-port-event-semaphore port)) @@ -571,9 +570,11 @@ (frame (pane-frame target-sheet)) ;; Works out which sheet *should* be the focus, not which ;; is currently... or at least, so I think. - (focus (climi::keyboard-input-focus frame))) + (focus (port-frame-keyboard-input-focus *beagle-port* + frame))) (unless (null target-sheet) - (setf (port-keyboard-input-focus *beagle-port*) focus)))) + (setf (port-frame-keyboard-input-focus *beagle-port* frame) + focus)))) nil) ((eq :did-expose n-type) (make-instance 'window-repaint-event

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle/output
by rschlatte 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/output In directory clnet:/tmp/cvs-serv30166/Backends/beagle/output Modified Files: fonts.lisp Log Message: Beagle backend fixes * functionality not tested, but it loads under clozure cl snapshot * Patches by Greg Pfeil Signed-off-by: Rudi Schlatte <rudi(a)constantly.at> --- /project/mcclim/cvsroot/mcclim/Backends/beagle/output/fonts.lisp 2006/03/23 15:27:24 1.3 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/output/fonts.lisp 2007/12/18 10:54:22 1.4 @@ -226,11 +226,11 @@ (text-size medium (string s) :text-style text-style :start start :end end)) (defmethod text-size ((medium beagle-medium) (string string) - &key (text-style (medium-text-style medium)) - (start 0) - ( end (length string))) + &key text-style (start 0) end) (declare (special *default-text-style*)) ;; Check for 'empty string' case + (unless end (setf end (length string))) + (unless text-style (setf text-style (medium-text-style medium))) (when (>= start end) ;; XXX is 0 value for the baseline correct? (return-from text-size (values 0 0 0 0 0)))

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle/windowing
by rschlatte 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/windowing In directory clnet:/tmp/cvs-serv30166/Backends/beagle/windowing Modified Files: port.lisp Log Message: Beagle backend fixes * functionality not tested, but it loads under clozure cl snapshot * Patches by Greg Pfeil Signed-off-by: Rudi Schlatte <rudi(a)constantly.at> --- /project/mcclim/cvsroot/mcclim/Backends/beagle/windowing/port.lisp 2006/03/24 11:18:27 1.6 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/windowing/port.lisp 2007/12/18 10:54:22 1.7 @@ -234,3 +234,11 @@ (declare (ignore port)) nil) +(defmethod port-frame-keyboard-input-focus ((port beagle-port) frame) + (declare (ignore frame)) + (beagle-port-key-focus port)) + +(defmethod (setf port-frame-keyboard-input-focus) + (focus (port beagle-port) frame) + (declare (ignore frame)) + (%set-port-keyboard-focus port focus))

1 0

[mcclim-cvs] CVS mcclim
by rschlatte 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv30166 Modified Files: mcclim.asd Log Message: Beagle backend fixes * functionality not tested, but it loads under clozure cl snapshot * Patches by Greg Pfeil Signed-off-by: Rudi Schlatte <rudi(a)constantly.at> --- /project/mcclim/cvsroot/mcclim/mcclim.asd 2007/12/08 08:53:59 1.63 +++ /project/mcclim/cvsroot/mcclim/mcclim.asd 2007/12/18 10:54:21 1.64 @@ -82,6 +82,12 @@ (defsystem :clx :class requireable-system)) +;;; Required for the beagle backend (not activated by default) +#+clozure-common-lisp +(progn + (require :cocoa) + (require :objc-support)) + (defmacro clim-defsystem ((module &key depends-on) &rest components) `(progn (asdf:defsystem ,module @@ -377,6 +383,71 @@ (:file "graft" :depends-on ("port" "package")) (:file "frame-manager" :depends-on ("medium" "port" "package")))))) +(defsystem :clim-beagle + :depends-on (clim) + :components + ((:module "Backends" + :components + ((:module "beagle" + :serial t + :components + ((:file "package") + (:module "native" + :components ((:file "lisp-bezier-path") + (:file "lisp-window") + (:file "lisp-window-delegate") + (:file "lisp-view" + :depends-on ("lisp-bezier-path")) + (:file "lisp-view-additional" + :depends-on ("lisp-view")) + (:file "lisp-scroller") + (:file "lisp-slider") + (:file "lisp-button") + (:file "lisp-image"))) + (:file "cocoa-util") + (:module "windowing" + :depends-on ("native") + :components ((:file "port") + (:file "frame-manager") + (:file "mirror") + (:file "graft"))) + (:module "native-panes" + :components ((:file "beagle-scroll-bar-pane") + (:file "beagle-slider-pane") + ;; Basic buttons - not collections of buttons + (:file "beagle-fundamental-button-pane") + ;; Button collections (radio + checkbox) + ;; (:file "beagle-button-collection-pane") + (:file "scroller-pane-fix"))) + (:module "output" + :depends-on ("windowing") + :components ((:file "medium") + (:file "fonts"))) + (:module "input" + :depends-on ("windowing") + :components ((:file "events") + (:file "keysymdef"))) + (:module "glimpse" + :components ((:file "glimpse") + (:file "glimpse-support") + (:file "glimpse-command-tables") + (:file "glimpse-present-process" + :depends-on ("glimpse" "glimpse-support")) + (:file "glimpse-present-window" + :depends-on ("glimpse" "glimpse-support")) + (:file "glimpse-modeless-commands" + :depends-on ("glimpse" "glimpse-support")) + (:file "glimpse-process-commands" + :depends-on ("glimpse" "glimpse-support")) + (:file "glimpse-window-commands" + :depends-on ("glimpse" "glimpse-support")))) + (:module "profile" + :components ((:file "profile"))) + (:module "tests" + :components ((:file "drawing-tests") + (:file "graft-tests")))))))) +) + (defsystem :clim-null :depends-on (:clim) :components

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle
by rschlatte 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory clnet:/tmp/cvs-serv30166/Backends/beagle Modified Files: package.lisp Removed Files: beagle-backend.asd Log Message: Beagle backend fixes * functionality not tested, but it loads under clozure cl snapshot * Patches by Greg Pfeil Signed-off-by: Rudi Schlatte <rudi(a)constantly.at> --- /project/mcclim/cvsroot/mcclim/Backends/beagle/package.lisp 2006/03/30 12:07:59 1.5 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/package.lisp 2007/12/18 10:54:21 1.6 @@ -1,6 +1,8 @@ - ;;; -*- Mode: Lisp; Package: COMMON-LISP-USER -*- +(eval-when (:compile-toplevel :load-toplevel :execute) + (require :cocoa)) + ;;; START - Cribbed from framework/cocoa-support.lisp (in-package "CCL") (defun nslog (c) @@ -24,7 +26,6 @@ #:port-event-process #:port-grafts - #:%set-port-keyboard-focus #:set-sheet-pointer-cursor ;; #:update-mirror-geometry @@ -63,7 +64,6 @@ #:width ;dito #:coordinate= #:get-transformation - #:keyboard-input-focus #:port-grab-pointer #:port-ungrab-pointer ;; @@ -100,4 +100,3 @@ #:with-nsstr) (:export #:beagle-standard-frame-manager #:beagle-aqua-frame-manager)) - \ No newline at end of file

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 18 Dec '07

18 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv2245/Drei Modified Files: views.lisp packages.lisp Log Message: Changed the tab-indentation code a bit. Whether or not to indent with tabs is now a property of the view, not the buffer. --- /project/mcclim/cvsroot/mcclim/Drei/views.lisp 2007/12/15 07:23:54 1.5 +++ /project/mcclim/cvsroot/mcclim/Drei/views.lisp 2007/12/18 08:39:43 1.6 @@ -57,7 +57,10 @@ (%tab-width :accessor recorded-tab-width :initform nil) (%recorded-stream :accessor recorded-stream - :initform nil))) + :initform nil) + (%use-tabs :accessor use-tabs + :initform *use-tabs-for-indentation* + :initarg :use-tabs))) (defun maybe-update-recordings (stream tabify) (with-accessors ((space-width recorded-space-width) @@ -368,10 +371,7 @@ (defclass drei-buffer (delegating-buffer esa-buffer-mixin observable-buffer-mixin) - ((point :initarg :point :initform nil :accessor point-of) - (indent-tabs-mode :initarg :indent-tabs-mode - :initform *use-tabs-for-indentation* - :accessor indent-tabs-mode)) + ((point :initarg :point :initform nil :accessor point-of)) (:default-initargs :implementation (make-instance 'extended-standard-buffer))) (defmethod initialize-instance :after ((buffer drei-buffer) &rest args --- /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2007/12/10 21:25:12 1.21 +++ /project/mcclim/cvsroot/mcclim/Drei/packages.lisp 2007/12/18 08:39:43 1.22 @@ -185,7 +185,6 @@ #:display-drei #:display-drei-pane #:display-drei-area #:full-redisplay #:offset-to-screen-position #:page-down #:page-up - #:indent-tabs-mode #:isearch-state #:search-string #:search-mark #:search-buffer #:search-forward-p #:search-success-p #:query-replace-state #:string1 #:string2 #:targets #:occurrences @@ -212,7 +211,7 @@ #:drei-syntax-view #:syntax #:point-mark-view #:textual-drei-syntax-view - #:tab-space-count #:space-width #:tab-width + #:tab-space-count #:space-width #:tab-width #:use-tabs #:auto-fill-mode #:auto-fill-column #:isearch-mode #:isearch-states #:isearch-previous-string #:query-replace-mode

1 0

[mcclim-cvs] CVS mcclim/Drei
by rstrandh 17 Dec '07

17 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv14501 Modified Files: core-commands.lisp lisp-syntax-commands.lisp Log Message: Fixed two more instances where the value of *drei-instance* was used directly whereas a view was required. --- /project/mcclim/cvsroot/mcclim/Drei/core-commands.lisp 2007/12/17 06:29:37 1.9 +++ /project/mcclim/cvsroot/mcclim/Drei/core-commands.lisp 2007/12/17 06:47:13 1.10 @@ -48,7 +48,7 @@ (defun set-fill-column (column) (if (> column 1) - (setf (auto-fill-column *drei-instance*) column) + (setf (auto-fill-column (current-view)) column) (progn (beep) (display-message "Set Fill Column requires an explicit argument.")))) (define-command (com-set-fill-column :name t :command-table fill-table) --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp 2007/12/08 23:25:23 1.12 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp 2007/12/17 06:47:13 1.13 @@ -56,7 +56,7 @@ "Fill paragraph at point. Will have no effect unless there is a string at point." (let* ((token (form-around (current-syntax) (offset (point)))) - (fill-column (auto-fill-column *drei-instance*))) + (fill-column (auto-fill-column (current-view)))) (when (form-string-p token) (with-accessors ((offset1 start-offset) (offset2 end-offset)) token

1 0

[mcclim-cvs] CVS mcclim/Drei
by rstrandh 17 Dec '07

17 Dec '07

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv11340 Modified Files: core-commands.lisp drei.lisp Log Message: Added additional documentation of *drei-instance* because it took me a while to figure out what type it was supposed to be. Auto-fill-mode is now a flag in the view, but com-auto-fill-mode called the accessor with *drei-instance* which is a pane. I fixed com-auto-fill-mode to call the accessor with the (current-view) instead. --- /project/mcclim/cvsroot/mcclim/Drei/core-commands.lisp 2007/12/08 23:25:23 1.8 +++ /project/mcclim/cvsroot/mcclim/Drei/core-commands.lisp 2007/12/17 06:29:37 1.9 @@ -259,8 +259,9 @@ '((#\^ :shift :meta))) (define-command (com-auto-fill-mode :name t :command-table fill-table) () - (setf (auto-fill-mode *drei-instance*) - (not (auto-fill-mode *drei-instance*)))) + (let ((view (current-view))) + (setf (auto-fill-mode view) + (not (auto-fill-mode view))))) (define-command (com-fill-paragraph :name t :command-table fill-table) () (let ((begin-mark (clone-mark (point))) --- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2007/12/10 21:25:12 1.21 +++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2007/12/17 06:29:37 1.22 @@ -64,7 +64,7 @@ ;;; Convenience stuff. (defvar *drei-instance* nil - "The currently running Drei instance.") + "The currently running Drei instance. The value is a subclass of pane.") (defun current-view (&optional (object *drei-instance*)) "Return the view of the provided object. If no object is

1 0