[mcclim-cvs] CVS mcclim

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv32766

Modified Files:
	frames.lisp 
Log Message:
Added some convenient restarts for when the output history gets messed up due to errors.


--- /project/mcclim/cvsroot/mcclim/frames.lisp	2008/01/30 11:48:40	1.131
+++ /project/mcclim/cvsroot/mcclim/frames.lisp	2008/02/03 09:10:45	1.132
@@ -395,22 +395,32 @@
   (let ((pane-object (if (typep pane 'pane)
 			 pane
 			 (find-pane-named frame pane))))
-    (multiple-value-bind (redisplayp clearp)
-	(pane-needs-redisplay pane-object)
-      (when force-p
-	(setq redisplayp (or redisplayp t)
-	      clearp t))
-      (when redisplayp
-	(let ((hilited (frame-hilited-presentation frame)))
-	  (when hilited
-	    (highlight-presentation-1 (car hilited) (cdr hilited) :unhighlight)
-	    (setf (frame-hilited-presentation frame) nil)))
-	(with-possible-double-buffering (frame pane-object)
-	  (when clearp
-	    (window-clear pane-object))
-	  (call-next-method))
-	(unless (or (eq redisplayp :command-loop) (eq redisplayp :no-clear))
-	  (setf (pane-needs-redisplay pane-object) nil))))))
+    (restart-case
+        (multiple-value-bind (redisplayp clearp)
+            (pane-needs-redisplay pane-object)
+          (when force-p
+            (setq redisplayp (or redisplayp t)
+                  clearp t))
+          (when redisplayp
+            (let ((hilited (frame-hilited-presentation frame)))
+              (when hilited
+                (highlight-presentation-1 (car hilited) (cdr hilited) :unhighlight)
+                (setf (frame-hilited-presentation frame) nil)))
+            (with-possible-double-buffering (frame pane-object)
+              (when clearp
+                (window-clear pane-object))
+              (call-next-method))
+            (unless (or (eq redisplayp :command-loop) (eq redisplayp :no-clear))
+              (setf (pane-needs-redisplay pane-object) nil))))
+      (clear-pane-try-again ()
+       :report "Clear the output history of the pane and reattempt forceful redisplay"
+       (window-clear pane)
+       (redisplay-frame-pane frame pane :force-p t))
+      (clear-pane ()
+       :report "Clear the output history of the pane, but don't redisplay"
+       (window-clear pane))
+      (skip-redisplay ()
+       :report "Skip this redisplay"))))
 
 (defmethod run-frame-top-level ((frame application-frame)
 				&key &allow-other-keys)