mcclim-cvs January 2008

mcclim-cvs@common-lisp.net

7 participants
255 discussions

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 27 Jan '08

27 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv15585/Drei Modified Files: drei-clim.lisp drei-redisplay.lisp Log Message: Don't redisplay cursor if the associated view has not been displayed yet. --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2008/01/27 09:36:07 1.33 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2008/01/27 10:46:53 1.34 @@ -189,10 +189,12 @@ (defmethod visible-1 and (cursor (view drei-buffer-view)) ;; We should only redisplay when the cursor is on display, or - ;; `offset-to-screen-position' will return a non-number. - (<= (offset (top view)) - (offset (mark cursor)) - (offset (bot view)))) + ;; `offset-to-screen-position' will return a non-number. Also don't + ;; display if the view hasn't been displayed yet. + (and (<= (offset (top view)) + (offset (mark cursor)) + (offset (bot view))) + (plusp (displayed-lines-count view)))) (defmethod (setf view) :after (new-val (drei drei-pane)) (window-clear drei)) --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/27 09:36:07 1.50 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/27 10:46:53 1.51 @@ -920,7 +920,7 @@ (defmethod display-drei-view-cursor :around ((stream extended-output-stream) (view drei-buffer-view) (cursor drei-cursor)) - (when (<= (offset (top view)) (offset (mark cursor)) (offset (bot view))) + (when (visible-p cursor) (clear-output-record cursor) (prog1 (call-next-method) (with-bounding-rectangle* (x1 y1 x2 y2) cursor @@ -1021,8 +1021,7 @@ (declare (ignore x-offset y-offset region)) (clear-output-record cursor) (with-output-recording-options (stream :record t :draw t) - (when (visible-p cursor) - (display-drei-view-cursor stream (view cursor) cursor)))) + (display-drei-view-cursor stream (view cursor) cursor))) (defun display-drei-area (drei) (with-accessors ((stream editor-pane) (view view)) drei

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 27 Jan '08

27 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv6197/Drei Modified Files: drei.lisp Log Message: Only delete cursor output records if they have a parent. --- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2008/01/27 09:36:07 1.31 +++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2008/01/27 10:23:05 1.32 @@ -358,7 +358,8 @@ ;; Delete the old cursors, then add the new ones, provided the ;; setting of the view is successful. (dolist (cursor (cursors drei)) - (delete-output-record cursor (output-record-parent cursor) nil)) + (when (output-record-parent cursor) + (delete-output-record cursor (output-record-parent cursor) nil))) (add-view-cursors drei)) (defmethod esa-current-buffer ((drei drei))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 27 Jan '08

27 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv29065/Drei Modified Files: drei-clim.lisp drei-redisplay.lisp drei.lisp input-editor.lisp Log Message: Changed a bit in how cursors work, they are now always part of the output history, and aren't arbitrarily added and removed as their state changes. Also restores the blue inactive-cursors in Climacs. --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2008/01/17 23:11:06 1.32 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2008/01/27 09:36:07 1.33 @@ -55,6 +55,12 @@ ;;; CLIM cursors, though perhaps this facility should be built on top ;;; of what CLIM already provides. That seemed a bit (=a lot) hairy, ;;; though. + +;;; Cursors are output records. When a cursor is created, it adds +;;; itself to its output stream. The owner of the cursor (a Drei +;;; instance) is responsible for removing the cursor once it is done +;;; with it. Cursors can be active/inactive and enabled/disabled and +;;; have the same activity-status as their associated view. (defclass drei-cursor (standard-sequence-output-record) ((%view :reader view :initarg :view @@ -90,6 +96,10 @@ Drei buffer. The most important role for instances of subclasses of this class is to visually represent the position of point.")) +(defmethod initialize-instance :after ((object drei-cursor) &rest initargs) + (declare (ignore initargs)) + (stream-add-output-record (output-stream object) object)) + (defmethod active ((cursor drei-cursor)) "Whether the cursor is active or not. An active cursor is drawn using the active ink, and an @@ -106,9 +116,6 @@ (active-ink cursor) (inactive-ink cursor))) -(defmethod (setf enabled) ((new-value null) (cursor drei-cursor)) - (erase-output-record cursor (output-stream cursor) nil)) - (defclass point-cursor (drei-cursor) () (:default-initargs @@ -136,7 +143,7 @@ (defmethod enabled ((cursor mark-cursor)) *show-mark*) -(defgeneric visible (cursor view) +(defgeneric visible-1 (cursor view) (:documentation "Is `cursor', associated with `view', visible? If this function returns true, it is assumed that it is safe to display `cursor' to the editor stream. If just one of the @@ -146,6 +153,12 @@ (:method and (cursor view) (enabled cursor))) +(defun visible-p (cursor) + "Return true if `cursor' is visible. This is a trampoline +function that calls `visible-1' with `cursor' and the view of +`cursor'." + (visible-1 cursor (view cursor))) + ;;; Drei instances. (defclass drei-pane (drei application-pane) @@ -174,7 +187,7 @@ ;; display surface. drei) -(defmethod visible and (cursor (view drei-view)) +(defmethod visible-1 and (cursor (view drei-buffer-view)) ;; We should only redisplay when the cursor is on display, or ;; `offset-to-screen-position' will return a non-number. (<= (offset (top view)) --- /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/22 22:35:38 1.49 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-redisplay.lisp 2008/01/27 09:36:07 1.50 @@ -83,7 +83,7 @@ is *guaranteed* to not return NIL or T.") (:method :around ((stream extended-output-stream) (view drei-view) (cursor drei-cursor)) - (when (visible cursor view) + (when (visible-p cursor) (letf (((stream-default-view stream) view)) (call-next-method))))) @@ -1003,7 +1003,7 @@ (dolist (cursor (cursors drei)) (apply #'erase-output-record cursor stream (when errorp-supplied - errorp)))) + (list errorp))))) ;; XXX: Full redraw for every replay, should probably use the `region' ;; parameter to only invalidate some strokes. @@ -1021,7 +1021,7 @@ (declare (ignore x-offset y-offset region)) (clear-output-record cursor) (with-output-recording-options (stream :record t :draw t) - (when (active cursor) + (when (visible-p cursor) (display-drei-view-cursor stream (view cursor) cursor)))) (defun display-drei-area (drei) --- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2008/01/21 17:08:28 1.30 +++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2008/01/27 09:36:07 1.31 @@ -281,6 +281,11 @@ considered the primary user-oriented cursor, most probably the cursor for the editor point. Note that this cursor is also in the cursors-list.") + (%cursors-visible :accessor cursors-visible + :initform t + :initarg :cursors-visible + :documentation "If true, the cursors of this +Drei instance will be visible. If false, they will not.") (%isearch-mode :initform nil :accessor isearch-mode) (%isearch-states :initform '() :accessor isearch-states) (%isearch-previous-string :initform nil :accessor isearch-previous-string) @@ -301,6 +306,10 @@ (defmethod (setf active) (new-val (drei drei)) (setf (active (view drei)) new-val)) +(defmethod (setf cursors-visible) :after (new-val (drei drei)) + (dolist (cursor (cursors drei)) + (setf (enabled cursor) new-val))) + (defmethod available-modes append ((modual drei)) (available-modes (view modual))) @@ -325,7 +334,7 @@ the Drei instance." (setf (cursors drei) (nreverse (create-view-cursors (editor-pane drei) (view drei)))) (dolist (cursor (cursors drei)) - (stream-add-output-record (editor-pane drei) cursor)) + (setf (enabled cursor) (cursors-visible drei))) ;; We define the point cursor to be the first point-cursor object ;; in the list of cursors. (setf (point-cursor drei) @@ -346,7 +355,10 @@ (add-view-cursors drei))) (defmethod (setf view) :after (new-val (drei drei)) - ;; We have some new cursors. + ;; Delete the old cursors, then add the new ones, provided the + ;; setting of the view is successful. + (dolist (cursor (cursors drei)) + (delete-output-record cursor (output-record-parent cursor) nil)) (add-view-cursors drei)) (defmethod esa-current-buffer ((drei drei)) --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/01/23 10:16:25 1.24 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2008/01/27 09:36:07 1.25 @@ -97,7 +97,8 @@ (defmethod (setf cursor-visibility) (visibility (stream drei-input-editing-mixin)) - (setf (active (drei-instance stream)) visibility)) + (setf (active (drei-instance stream)) visibility + (cursors-visible (drei-instance stream)) visibility)) (defclass drei-unselectable-presentation (presentation) ()

1 0

[mcclim-cvs] CVS mcclim/Apps/Debugger
by ahefner 27 Jan '08

27 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Apps/Debugger In directory clnet:/tmp/cvs-serv32572 Modified Files: clim-debugger.lisp Log Message: Patch from Cyrus Harmon: "The following patch fixes the mcclim debugger to work with swank. The condition-references slot is now gone, although there is some remnant of this in the 'compiler-condition and in the condition-extras. I think the right thing to do is to remove the slot from 'debugger-info, BICBW." --- /project/mcclim/cvsroot/mcclim/Apps/Debugger/clim-debugger.lisp 2005/04/26 03:19:34 1.1 +++ /project/mcclim/cvsroot/mcclim/Apps/Debugger/clim-debugger.lisp 2008/01/27 04:52:11 1.2 @@ -106,8 +106,6 @@ :initarg :type-of-condition) (condition-extra :accessor condition-extra :initarg :condition-extra) - (condition-references :accessor condition-references - :initarg :condition-references) (restarts :accessor restarts :initarg :restarts) (backtrace :accessor backtrace @@ -273,10 +271,6 @@ pane))) (when (condition-extra (condition-info pane)) (std-form pane "Extra:" (condition-extra (condition-info pane)) - :family :fix)) - (when (condition-references (condition-info pane)) - (std-form pane "References:" (condition-references (condition-info - pane)) :family :fix))) (fresh-line) @@ -389,7 +383,6 @@ :type-of-condition (type-of condition) :condition-message (swank::safe-condition-message condition) :condition-extra (swank::condition-extras condition) - :condition-references (swank::condition-references condition) :restarts (compute-restarts) :backtrace (compute-backtrace 0 20))) (run-debugger-frame))

1 0

[mcclim-cvs] CVS mcclim-website
by thenriksen 27 Jan '08

27 Jan '08

Update of /project/mcclim/cvsroot/mcclim-website In directory clnet:/tmp/cvs-serv30340 Added Files: mcclim.cliki.png Log Message: Added logo for the McCLIM wiki. --- /project/mcclim/cvsroot/mcclim-website/mcclim.cliki.png 2008/01/26 23:59:00 NONE +++ /project/mcclim/cvsroot/mcclim-website/mcclim.cliki.png 2008/01/26 23:59:00 1.1 PNG IHDR2^Dâ UIDATxíkPWÇOÏKf`xÎÀø ¡4Pµ©ÚZEKaËRÄP(RÀšlU+l( EaQŽn\V××X aŒPPóìéýÐ€mó Sß§Ó§Ï=÷tÿ»ïíŸ=Ž··/[¶lX µøcÀÊØ°26¬M+Cû%;Htr:BAÈþÃ/ZŽè,æçB¡dddŒ2ì £Mqòø@ãihSîñ%{5MDDÄöíÛ ü=zôš¯¯÷ âççÆãñpT*ÅÓ{d±XÓýÃÃÃdºËåº¹¹õ÷÷OLLý<ÏÙÙyö£7hUXX8{«IÚÛÛ1sÑéô:Eõ»&f +=9óÇæÎÅœñgcé}}}eeedÏÐÐP(ôððÀ€P(T*J¥",_ŸŒ°°Ã°êêjwwwÜOààà°sçÎIOOg±Xä`Ax<^ii)añññÞÞÞälQQQ³VëççGÄÓhŽ/feeÍÞÇPûGÅHüZ#W6Õÿ~íÃu«îU3_œ2TÿÕYÐëõ¹¹¹L&?ï;vìš««S(øÞï¿ÿþÈ#NNNLdššš NÁöíÛ_yä»¢¢Â`ï-[È ÕÖÖÎêÆäà'Nà~#0yÆôðé'=6üìœ|RN£ÑÕÓû{UyÙœ°öw®F%Ç°ŽŽŽ(JuíÚµ3gÎ¬Y³žfÁáÃëëë.\žxñb¢á{ÉÃ!n:äx@`°wÅäÍYRD"òŠ··÷+{'c²ù9}NNŽß>Sáúï~GNÁCŽZLtš[©Ôû Xnº1Ésssq»ŒŒ<**jÆ0@Àçóù|Ÿ©ÅNÀíªªªÎÎÎÃkjj.]jvGŠ p¯vüAœdÏGo°ì©ž§åÌWÀ§O4Á_gGUaNSèËåžœvíÚèèèYœŒŒM*Þ$INNÆmN=cH$âr¹[·n5»#Óø²Xìù&|66HßyÏF§Ü-M²Á~ÕÂEó`å*Çé©T*ý¿.Ö|óðTUUávLL2«heee±±±&o*qqqÄñ¹sçºººŸûî»ªª*¡Phooov/& £~áÑhô-òðHg¿@&Õæ|tÐ«EÎGYä`ªŸNÔ{Ž÷Ï)?Ü¯âÎÛ·o!!!fÌÜbggwðàAÜFQôÔ©S"ÃáìÞœÛ^L@ÖkµXo·²ç±÷tw)ßôaò° Œx®#"rûãšún%ßÅdQÉyŸ85ôõ¥ÑÂ¥ø0µ ÅýíííDÌÏ:ŸOBB1]<yòéÓ§Ä®ÊÊJ¡Pèà`xy žºÑyóç¬v$&Ú»ã«×8!ØÛS9 öî8B5o;7=aMªÿ9vîËaáÇ^T*átæŒÿÛk]ð]* ^3L&qËåòcÇ»X,V\\]6ùëâÏzðøfÃ=Éª5NÀughÔzÉžîÅsmñçûPO//+=5æäêJ¶#ÍËIìµ³³#ìÑÑQóiNIJJÂ_; ššÅ%%%»ví"^ÍÆ4©ñÙvô©ÆÏWW:bhþßú²iz=ö°AÊ`PÙDóæFÙa ®ÙtÈïäáÈºp8={öà¶T*---A8`y~óWCïÕt€ÑptŠ@QÁNE®sÇÊÏµ}ÄxM€?¶N'""°«««Í.lÎIMMe³'/£ŒŒŒ®®®Ó§O'&&ëQ`Ÿÿœùüë9žÍã1 îÛñ4/Üó ^ !«§Lím ðô²#;QÃèèh|Î=;88hvmÓQ*2ÌŒ¶gÛ¶mž=<<¥V«wíÚ5')@kN§L_;&âpÝ'§{µðò0Ð§¥ROxïKõã6Ã!Þ}T*UjjªyµÍÈþýûsrrÌn. iŽÉãÞÞÞKÞ~É @kü³Üþóå#' çõÌ|8\ºŸ1frFRN -d Õ`äøxõuÕS®ÿMuûÍxÒoZœz5nWVVŠŠŠjµZóD]]%#qÐhŽôôô9© @¡@³þÒ]Y1RZ4(è>Í÷uu{¹Œèpæürûû¶VZ¥O³z>ØÚö±ðÇ]J s²ñ{áÄlå}žßÁxYÍŸvíZhh(ŸyõêUEÉÅÜ¿?!!aóæÍFßÚÚj0«k4/NŠM2L¯×+ ²sÓŠMt:7üýý*É¹-hèTô<Ðéô¯~þLSrbàÖÆº»&ŽZœþÇèWçGÎ~1Ô=õûÁ÷µZ-\\\"CBBbcc]]]qww¯©©Áã={¶qãF"Çã`³ÙøªÆÍ71»|ùòÞœ{¹\.ÿÖ[oeddàkÎ.\ÈÌÌ?>lÞŒùèÑ£*Õä2û»ïŸßCwïÞ%JššHII!Ëó÷÷OKKkll4r9ÚØ/blGÛÑØ`WúI3|_d2)b_ýàÌ`0222öíÛwåÊ;wî455=yò€¹¹yhhÈÃÃcýúõï¿ÿ~tt41(766JeOOnã?;óõõ%¯¹\îÞœ{gìZV3€€$|EQâæãóù·nÝ r°..¯<šÄ/bsÅô/b¯!ÅÅÅ@¥RËËËã;àgÅÞÞŸ-++ËÚÌR©Eãããóóó7lØ0{Œ±sþëpü*@Q<Ö§§§ët:ËÓÚ~d, eÝºuÄfvvv||ŒÁã9i-lÿÂ`úœtéRCC9_9à×Bxx8yóÎ;+W®Ž0§í0@àââÂçóñ_iäååYÓ& Ðéôë×¯wtt€€€@uuµÁâÌÁödr¹<99Y,[ ±ýEÉºØ +cÀÊØ°26¬M+cÀÊØ°26¬M+cÀÊØ°26¬M+cÀÊü£ tT²þùIEND®B`

1 0

[mcclim-cvs] CVS mcclim/Webpage/images
by afuchs 26 Jan '08

26 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Webpage/images In directory clnet:/tmp/cvs-serv31616/images Removed Files: addressbook-small.jpg addressbook.jpg bach262-small.jpg bach262.jpg calc.jpg colorslider-small.jpg colorslider.jpg index.html listener1-small.jpg listener1.jpg Log Message: Move the mcclim web presence to module "mcclim-website".

1 0

[mcclim-cvs] CVS mcclim/Webpage/downloads
by afuchs 26 Jan '08

26 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Webpage/downloads In directory clnet:/tmp/cvs-serv31616/downloads Removed Files: index.html Log Message: Move the mcclim web presence to module "mcclim-website".

1 0

[mcclim-cvs] CVS mcclim/Webpage
by afuchs 26 Jan '08

26 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Webpage In directory clnet:/tmp/cvs-serv31616 Removed Files: License McCLIM-3.png clim-paper.pdf index.html mcclim.css Log Message: Move the mcclim web presence to module "mcclim-website".

1 0

[mcclim-cvs] CVS mcclim-website
by afuchs 26 Jan '08

26 Jan '08

Update of /project/mcclim/cvsroot/mcclim-website In directory clnet:/tmp/cvs-serv30884 Log Message: I dedicate this module to the mcclim web presence Status: Vendor Tag: WEB Release Tags: initial N mcclim-website/License N mcclim-website/McCLIM-3.png N mcclim-website/clim-paper.pdf N mcclim-website/index.html N mcclim-website/mcclim.css N mcclim-website/downloads/index.html N mcclim-website/images/addressbook-small.jpg N mcclim-website/images/addressbook.jpg N mcclim-website/images/bach262-small.jpg N mcclim-website/images/bach262.jpg N mcclim-website/images/calc.jpg N mcclim-website/images/colorslider-small.jpg N mcclim-website/images/colorslider.jpg N mcclim-website/images/index.html N mcclim-website/images/listener1-small.jpg N mcclim-website/images/listener1.jpg No conflicts created by this import

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 26 Jan '08

26 Jan '08

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv24230/Drei Modified Files: search-commands.lisp Log Message: Fixed some trivial bugs in search/replace. --- /project/mcclim/cvsroot/mcclim/Drei/search-commands.lisp 2008/01/17 11:29:55 1.6 +++ /project/mcclim/cvsroot/mcclim/Drei/search-commands.lisp 2008/01/26 12:37:25 1.7 @@ -332,7 +332,7 @@ (defun query-replace-find-next-match (state) (with-accessors ((string string1) (targets targets)) state - (let* ((mark (point (drei-instance (targets state)))) + (let* ((mark (point (view (drei-instance (targets state))))) (offset-before (offset mark))) (search-forward mark string :test (case-relevant-test string)) (if (= (offset mark) offset-before) @@ -400,7 +400,7 @@ (occurrences occurrences) (targets targets)) state (let ((string1-length (length string1)) - (mark (point (drei-instance targets)))) + (mark (point (view (drei-instance targets))))) (backward-object mark string1-length) (replace-one-string mark string1-length

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs January 2008