branch: elpa/pacmacs
commit c2303269c0e836e93d77c04f0d334b2950d4f805
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Drop XBM support for empty cells (#141)
---
pacmacs-image.el | 6 ------
pacmacs-render.el | 9 +++++----
test/pacmacs-image-test.el | 16 ----------------
3 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/pacmacs-image.el b/pacmacs-image.el
index dc3c518432..1043589560 100644
--- a/pacmacs-image.el
+++ b/pacmacs-image.el
@@ -156,12 +156,6 @@
'xpm t))
pacmacs--wall-blocks))))
-(defun pacmacs-create-transparent-block (width height)
- (create-image
- (make-vector
- width (make-bool-vector height nil))
- 'xbm t :width width :height height))
-
(provide 'pacmacs-image)
;;; pacmacs-anim.el ends here
diff --git a/pacmacs-render.el b/pacmacs-render.el
index 0a7e6f4bad..3606baa326 100644
--- a/pacmacs-render.el
+++ b/pacmacs-render.el
@@ -36,13 +36,14 @@
(require 'pacmacs-anim)
(require 'pacmacs-board)
-(defvar pacmacs--empty-cell nil)
(defvar pacmacs--life-icon nil)
(defun pacmacs--render-empty-cell ()
- (when (not pacmacs--empty-cell)
- (setq pacmacs--empty-cell (pacmacs-create-transparent-block 40 40)))
- (pacmacs-insert-image pacmacs--empty-cell '(0 0 40 40)))
+ (pacmacs-insert-image (pacmacs--create-wall-tile
+ 40 40
+ nil nil nil nil
+ nil nil nil nil)
+ '(0 0 40 40)))
(defun pacmacs--render-life-icon ()
(when (not pacmacs--life-icon)
diff --git a/test/pacmacs-image-test.el b/test/pacmacs-image-test.el
index 6bf68f5a1c..aebc7999b6 100644
--- a/test/pacmacs-image-test.el
+++ b/test/pacmacs-image-test.el
@@ -36,22 +36,6 @@
(should (equal create-image-result
(pacmacs-create-color-block width height color))))))
-(ert-deftest pacmacs-create-transparent-block ()
- (let ((width 10)
- (height 20)
- (bool-vector-result 42)
- (make-vector-result 43)
- (create-image-result 44))
- (with-mock
- (mock (make-bool-vector height nil) => bool-vector-result :times 1)
- (mock (make-vector width bool-vector-result) => make-vector-result :times
1)
- (mock (create-image make-vector-result
- 'xbm t
- :width width
- :height height) => create-image-result :times 1)
- (should (equal create-image-result
- (pacmacs-create-transparent-block width height))))))
-
(ert-deftest pacmacs--put-bits-dot-test ()
(let ((input-bits (pacmacs--construct-2d-bool-vector
'((nil nil nil)
