summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2012-09-02 20:19:36 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2012-09-02 20:19:36 +0200
commitbc9f7f7db6570a07b991cb3cf3f7aee71523d509 (patch)
tree29a923d95e31d08a5970bff50a621334814af4f7 /elisp
parentef3bebd22708deefcd4c057dcbe678b764a78559 (diff)
downloadgeiser-bc9f7f7db6570a07b991cb3cf3f7aee71523d509.tar.gz
geiser-bc9f7f7db6570a07b991cb3cf3f7aee71523d509.tar.bz2
racket: displaying images also during evaluations
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-debug.el36
-rw-r--r--elisp/geiser-image.el46
-rw-r--r--elisp/geiser-repl.el4
3 files changed, 56 insertions, 30 deletions
diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el
index d7cf338..e5c13bf 100644
--- a/elisp/geiser-debug.el
+++ b/elisp/geiser-debug.el
@@ -1,6 +1,6 @@
;;; geiser-debug.el -- displaying debug information and evaluation results
-;; Copyright (C) 2009, 2010, 2011 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012 Jose Antonio Ortega Ruiz
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the Modified BSD License. You should
@@ -42,6 +42,15 @@ has no effect."
:group 'geiser-debug
:type 'int)
+
+(geiser-custom--defcustom geiser-debug-auto-display-images-p t
+ "Whether to automatically invoke the external viewer to display
+images when they're evaluated.
+
+See also `geiser-repl-auto-display-images-p'."
+ :group 'geiser-debug
+ :type 'boolean)
+
;;; Debug buffer mode:
@@ -102,13 +111,26 @@ buffer.")
(count-lines (point-min) (point-max)))
geiser-debug-long-sexp-lines)))
-(defun geiser-debug--display-retort (what ret &optional res)
+(defun geiser-debug--insert-res (res)
+ (let ((begin (point)))
+ (insert res)
+ (let ((end (point)))
+ (goto-char begin)
+ (let ((no
+ (geiser-image--replace-images t
+ geiser-debug-auto-display-images-p)))
+ (goto-char end)
+ (newline 2)
+ (and no (> no 0))))))
+
+(defun geiser-debug--display-retort (what ret &optional res auto-p)
(let* ((err (geiser-eval--retort-error ret))
(key (geiser-eval--error-key err))
(output (geiser-eval--retort-output ret))
(impl geiser-impl--implementation)
(module (geiser-eval--get-module))
- (jump nil)
+ (dbg nil)
+ (img nil)
(dir default-directory)
(buffer (current-buffer))
(debug (eq key 'geiser-debugger))
@@ -122,16 +144,14 @@ buffer.")
(unless after
(geiser-debug--display-error impl module nil what)
(newline 2))
- (when (and res (not err))
- (insert res)
- (newline 2))
- (setq jump (geiser-debug--display-error impl module key output))
+ (setq img (when (and res (not err)) (geiser-debug--insert-res res)))
+ (setq dbg (geiser-debug--display-error impl module key output))
(when after
(goto-char (point-max))
(insert "\nExpression evaluated was:\n\n")
(geiser-debug--display-error impl module nil what))
(goto-char (point-min)))
- (when jump (geiser-debug--pop-to-buffer))))
+ (when (or img dbg) (geiser-debug--pop-to-buffer))))
(defsubst geiser-debug--wrap-region (str)
(format "(begin %s)" str))
diff --git a/elisp/geiser-image.el b/elisp/geiser-image.el
index 6b77ff3..f194e04 100644
--- a/elisp/geiser-image.el
+++ b/elisp/geiser-image.el
@@ -77,29 +77,33 @@ images in `geiser-image-cache-dir'."
'action 'geiser-image--button-action
'follow-link t)
+(defun geiser-image--insert-button (file)
+ (insert-text-button "[image]"
+ :type 'geiser-image--button
+ 'face 'geiser-font-lock-image-button
+ 'geiser-image-file file
+ 'help-echo "Click to display image"))
+
(defun geiser-image--replace-images (inline-images-p auto-p)
"Replace all image patterns with actual images"
- (with-silent-modifications
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward "#<Image: \\([-+./_0-9a-zA-Z]+\\)>" nil t)
- ;; can't pass a filename to create-image because emacs might
- ;; not display it before it gets deleted (race condition)
- (let* ((file (match-string 1))
- (begin (match-beginning 0))
- (end (match-end 0)))
- (delete-region begin end)
- (if (and inline-images-p (display-images-p))
- (put-image (create-image file) begin "[image]")
- (goto-char begin)
- (insert-text-button "[image]"
- :type 'geiser-image--button
- 'face 'geiser-font-lock-image-button
- 'geiser-image-file file
- 'help-echo "Click to display image")
- (when auto-p (geiser-image--display file)))
- (setq geiser-image-cache-dir (file-name-directory file))
- (geiser-image--clean-cache))))))
+ (let ((seen 0))
+ (with-silent-modifications
+ (save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward "\"?#<Image: \\([-+./_0-9a-zA-Z]+\\)>\"?" nil t)
+ (setq seen (+ 1 seen))
+ (let* ((file (match-string 1))
+ (begin (match-beginning 0))
+ (end (match-end 0)))
+ (delete-region begin end)
+ (if (and inline-images-p (display-images-p))
+ (put-image (create-image file) begin "[image]")
+ (goto-char begin)
+ (geiser-image--insert-button file)
+ (when auto-p (geiser-image--display file)))
+ (setq geiser-image-cache-dir (file-name-directory file))
+ (geiser-image--clean-cache)))))
+ seen))
(defun geiser-view-last-image (n)
"Open the last displayed image in the system's image viewer.
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index ddcc6b8..c8846ea 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -123,7 +123,9 @@ If you have a slow system, try to increase this time."
(geiser-custom--defcustom geiser-repl-auto-display-images-p t
"Whether to automatically invoke the external viewer to display
-images pooping up in the REPL."
+images popping up in the REPL.
+
+See also `geiser-debug-auto-display-images-p'."
:type 'boolean
:group 'geiser-repl)