X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=spray.el;h=10b44416706aade28d08720c460e9b1ec47a3e58;hb=8023cd3e677541411695fad109648de8e961a1fe;hp=a34b58fe299e988e10c2e791c9e32b5e50d89740;hpb=7d12eb735a08d4b389a9f0c4a59061e93b3bca6e;p=spray

diff --git a/spray.el b/spray.el
index a34b58f..10b4441 100644
--- a/spray.el
+++ b/spray.el
@@ -1,7 +1,12 @@
 ;; custom
-(defvar spray-freq (/ 60.0 300) "60.0 / WPM")
+(defvar spray-wpm 400 "words/min")
 (defvar spray-text-scale 5)
-(defvar spray-orp-face 'error)
+
+(make-face 'spray-orp-face)
+(set-face-attribute 'spray-orp-face nil
+                    :foreground "red"
+                    :underline (face-foreground 'default)
+                    :overline (face-foreground 'default))
 
 ;; internal variables for spraying
 (defvar spray--padding-overlay nil)
@@ -22,11 +27,11 @@
   (cond (spray-mode
          (setq spray--orp-overlay (make-overlay 0 0)
                spray--padding-overlay (make-overlay 0 0)
-               spray--timer (run-with-timer 0 spray-freq 'spray-next)
+               spray--timer (run-with-timer 0 (/ 60.0 spray-wpm) 'spray-next)
                spray--saved-cursor-type cursor-type)
          (setq cursor-type nil)
          (text-scale-set spray-text-scale)
-         (overlay-put spray--orp-overlay 'face spray-orp-face)
+         (overlay-put spray--orp-overlay 'face 'spray-orp-face)
          (add-hook 'pre-command-hook 'turn-off-spray-mode)
          ;; disable incompatible minor-modes
          (when (boundp 'global-hl-line-mode)
@@ -58,29 +63,33 @@
 (defun turn-off-spray-mode () (interactive) (spray-mode -1))
 
 (defun spray-next ()
-  (if (not (zerop spray--delay))
-      (setq spray--delay (1- spray--delay))
-    (widen)
-    (if (eobp)
-        (turn-off-spray-mode)
-      (skip-chars-forward "\s\t\n")
-      (let* ((beg (point))
-             (len (skip-chars-forward "^\s\t\n"))
-             (end (point))
-             (orp (+ beg (cl-case len
-                           ((1) 1)
-                           ((2 3 4 5) 2)
-                           ((6 7 8 9) 3)
-                           ((10 11 12 13) 4)
-                           (t 5)))))
-        (setq spray--delay (+ (if (> len 8) 1 0) (cl-case (char-before)
-                                                   ((?. ?! ?\? ?\;) 3)
-                                                   ((?, ?:) 1)
-                                                   (t 0))))
-        (overlay-put spray--padding-overlay
-                     'before-string (make-string (- 5 (- orp beg)) ?\s))
-        (move-overlay spray--padding-overlay beg (1+ beg))
-        (move-overlay spray--orp-overlay (1- orp) orp)
-        (narrow-to-region beg end)))))
+  (cond ((not (zerop spray--delay))
+         (setq spray--delay (1- spray--delay))
+         (when (and (<= spray--delay 2)
+                    (= (char-before) ?.))
+           (narrow-to-region (point) (point))))
+        (t
+         (widen)
+         (if (eobp)
+             (turn-off-spray-mode)
+           (skip-chars-forward "\s\t\n")
+           (let* ((beg (point))
+                  (len (skip-chars-forward "^\s\t\n"))
+                  (end (point))
+                  (orp (+ beg (cl-case len
+                                ((1) 1)
+                                ((2 3 4 5) 2)
+                                ((6 7 8 9) 3)
+                                ((10 11 12 13) 4)
+                                (t 5)))))
+             (setq spray--delay (+ (if (> len 8) 1 0) (cl-case (char-before)
+                                                        ((?. ?! ?\? ?\;) 3)
+                                                        ((?, ?:) 1)
+                                                        (t 0))))
+             (overlay-put spray--padding-overlay
+                          'before-string (make-string (- 5 (- orp beg)) ?\s))
+             (move-overlay spray--padding-overlay beg (1+ beg))
+             (move-overlay spray--orp-overlay (1- orp) orp)
+             (narrow-to-region beg end))))))
 
 (provide 'spray)