summaryrefslogtreecommitdiff
path: root/lisp/play/blackbox.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/play/blackbox.el')
-rw-r--r--lisp/play/blackbox.el47
1 files changed, 25 insertions, 22 deletions
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index ffde5c46021..fb0474d1460 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -51,11 +51,11 @@
;; 2 H 4 H
;;
;; Rays which enter and exit are numbered. You can see that rays 1 & 5 pass
-;; thru the box undisturbed. Ray 2 is deflected by the northwesternmost
+;; thru the box undisturbed. Ray 2 is deflected by the northwesternmost
;; ball. Likewise rays 3 and 4. Rays which hit balls and are absorbed are
;; marked with H. The bottom of the left and the right of the bottom hit
;; the southeastern ball directly. Rays may also hit balls after being
-;; reflected. Consider the H on the bottom next to the 4. It bounces off
+;; reflected. Consider the H on the bottom next to the 4. It bounces off
;; the NW-ern most ball and hits the central ball. A ray shot from above
;; the right side 5 would hit the SE-ern most ball. The R beneath the 5
;; is because the ball is returned instantly. It is not allowed into
@@ -69,8 +69,6 @@
;;; Code:
-(defvar blackbox-mode-map nil "")
-
(defvar bb-board nil
"Blackbox board.")
@@ -89,23 +87,28 @@
(defvar bb-balls-placed nil
"List of already placed balls.")
-(unless blackbox-mode-map
- (setq blackbox-mode-map (make-keymap))
- (suppress-keymap blackbox-mode-map t)
- (define-key blackbox-mode-map "\C-f" 'bb-right)
- (define-key blackbox-mode-map [right] 'bb-right)
- (define-key blackbox-mode-map "\C-b" 'bb-left)
- (define-key blackbox-mode-map [left] 'bb-left)
- (define-key blackbox-mode-map "\C-p" 'bb-up)
- (define-key blackbox-mode-map [up] 'bb-up)
- (define-key blackbox-mode-map "\C-n" 'bb-down)
- (define-key blackbox-mode-map [down] 'bb-down)
- (define-key blackbox-mode-map "\C-e" 'bb-eol)
- (define-key blackbox-mode-map "\C-a" 'bb-bol)
- (define-key blackbox-mode-map " " 'bb-romp)
- (define-key blackbox-mode-map [insert] 'bb-romp)
- (define-key blackbox-mode-map "\C-m" 'bb-done)
- (define-key blackbox-mode-map [kp-enter] 'bb-done))
+;; This is used below to remap existing bindings for cursor motion to
+;; blackbox-specific bindings in blackbox-mode-map. This is so that
+;; users who prefer non-default key bindings for cursor motion don't
+;; lose that when they play Blackbox.
+(defun blackbox-redefine-key (map oldfun newfun)
+ "Redefine keys that run the function OLDFUN to run NEWFUN instead."
+ (define-key map (vector 'remap oldfun) newfun))
+
+
+(defvar blackbox-mode-map
+ (let ((map (make-keymap)))
+ (suppress-keymap map t)
+ (blackbox-redefine-key map 'backward-char 'bb-left)
+ (blackbox-redefine-key map 'forward-char 'bb-right)
+ (blackbox-redefine-key map 'previous-line 'bb-up)
+ (blackbox-redefine-key map 'next-line 'bb-down)
+ (blackbox-redefine-key map 'move-end-of-line 'bb-eol)
+ (blackbox-redefine-key map 'move-beginning-of-line 'bb-bol)
+ (define-key map " " 'bb-romp)
+ (define-key map [insert] 'bb-romp)
+ (blackbox-redefine-key map 'newline 'bb-done)
+ map))
;; Blackbox mode is suitable only for specially formatted data.
(put 'blackbox-mode 'mode-class 'special)
@@ -431,5 +434,5 @@ a reflection."
(provide 'blackbox)
-;;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
+;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
;;; blackbox.el ends here