minor fixes for the merged commits

[spray] / spray.el

diff --git a/spray.el b/spray.el
index afefae2541f06ae66cc38f2af4e5da1e9967c3f9..95951ca2d05ab9c4b8dca6e624e0c4143c1643ab 100644 (file)
--- a/spray.el
+++ b/spray.el
@@ -35,6 +35,12 @@
 ;;
 ;; For more informations, see Readme.org.
 
 ;;
 ;; For more informations, see Readme.org.
 

+;; Known bugs.
+;; repeated words are indistinguishable, for example
+;; "going, going, gone" reads like going, gone, with a slight delay.
+;;
+;; sentences (like this) should trigger a pause for ( and )
+

 ;;; Change Log:
 ;; 0.0.0 test release
 ;; 0.0.1 add spray-set-margins
 ;;; Change Log:
 ;; 0.0.0 test release
 ;; 0.0.1 add spray-set-margins


@@ -46,10 +52,23 @@
 
 ;; * customizable vars
 
 
 ;; * customizable vars
 

-(defvar spray-wpm 400 "words/min")
-(defvar spray-height 400 "height of characters")
-(defvar spray-margin-top 1 "character margin at top of buffer. Characters are as big as spray text characters.")
-(defvar spray-margin-left 0 "character margin at left of buffer. Characters are as big as spray text characters.")
+(defvar spray-wpm 400
+  "words/min")
+
+(defvar spray-height 400
+  "height of characters")
+
+(defvar spray-margin-top 1
+  "character margin at top of buffer. Characters are as big as
+  spray text characters.")
+
+(defvar spray-margin-left 1
+  "character margin at left of buffer. Characters are as big as
+  spray text characters.")
+
+(defvar spray-ramp 2
+  "Ramp up to full speed. Pause for this multiple of wpm on the first word,
+decreasing by one for each subsequent word.")

 
 (defvar spray-mode-map
   (let ((km (make-sparse-keymap)))
 
 (defvar spray-mode-map
   (let ((km (make-sparse-keymap)))


@@ -62,36 +81,40 @@
     (define-key km (kbd "s") 'spray-slower)
     (define-key km (kbd "q") 'spray-quit)
     (define-key km (kbd "<return>") 'spray-quit)
     (define-key km (kbd "s") 'spray-slower)
     (define-key km (kbd "q") 'spray-quit)
     (define-key km (kbd "<return>") 'spray-quit)

+    (define-key km [remap forward-char] 'spray-forward-word)
+    (define-key km [remap backward-char] 'spray-backward-word)
+    (define-key km [remap forward-word] 'spray-forward-word)
+    (define-key km [remap backward-word] 'spray-backward-word)
+    (define-key km [remap keyboard-quit] 'spray-quit)

     km)
   "keymap for spray-mode buffers")
 
     km)
   "keymap for spray-mode buffers")
 

+(defvar spray-unsupported-minor-modes
+  '(buffer-face-mode smartparens-mode highlight-symbol-mode))
+

 ;; * faces
 
 (make-face 'spray-base-face)
 (set-face-attribute 'spray-base-face nil
 ;; * faces
 
 (make-face 'spray-base-face)
 (set-face-attribute 'spray-base-face nil

-                    :background (face-background 'default)
-                    :foreground (face-foreground 'default)
-                    :slant 'normal)
+                    :inherit 'default)

 
 (make-face 'spray-accent-face)
 (set-face-attribute 'spray-accent-face nil
 
 (make-face 'spray-accent-face)
 (set-face-attribute 'spray-accent-face nil

-                    :foreground "red"
-                    :overline (face-foreground 'default)
-                    :underline (face-foreground 'default)
-                    :slant 'normal)
+                    :inherit 'spray-base-face
+                    :foreground "red")

 
 ;; * internal vars
 
 
 ;; * internal vars
 

-(defvar spray--margin-string ""
-  "Currently not used.")
+(defvar spray--margin-string "")

 (defvar spray--base-overlay nil)
 (defvar spray--accent-overlay nil)
 (defvar spray--running nil)
 (defvar spray--base-overlay nil)
 (defvar spray--accent-overlay nil)
 (defvar spray--running nil)

+(defvar spray--first-words 0)
+(defvar spray--initial-delay 0)

 (defvar spray--delay 0)
 (defvar spray--saved-cursor-type nil)
 (defvar spray--delay 0)
 (defvar spray--saved-cursor-type nil)

-(defvar spray--saved-buffer-face nil)

 (defvar spray--saved-restriction nil)
 (defvar spray--saved-restriction nil)

-(defvar spray--saved-smartparens-enabled nil)
+(defvar spray--saved-minor-modes nil)

 
 ;; * utility functions
 
 
 ;; * utility functions
 


@@ -113,15 +136,11 @@
                spray--accent-overlay (make-overlay 0 0)
                spray--saved-cursor-type cursor-type
                spray--saved-restriction (and (buffer-narrowed-p)
                spray--accent-overlay (make-overlay 0 0)
                spray--saved-cursor-type cursor-type
                spray--saved-restriction (and (buffer-narrowed-p)

-                                             (cons (point-min) (point-max)))
-               spray--saved-buffer-face (and (boundp 'buffer-face-mode)
-                                             buffer-face-mode
-                                             buffer-face-mode-face)
-               spray--saved-smartparens-enabled (and (boundp 'smartparens-mode)
-                                                     smartparens-mode))
-         ;; smartparens wrapping of all letter binds can cause problems.
-         ;; for example, it can cause auto-complete to activate
-         (and spray--saved-smartparens-enabled (smartparens-mode -1))
+                                             (cons (point-min) (point-max))))
+         (dolist (mode spray-unsupported-minor-modes)
+           (when (and (boundp mode) (eval mode))
+             (funcall mode -1)
+             (push mode spray--saved-minor-modes)))

          (setq cursor-type nil)
          (let ((buffer-face-mode-face `(:height ,spray-height)))
            (buffer-face-mode 1))
          (setq cursor-type nil)
          (let ((buffer-face-mode-face `(:height ,spray-height)))
            (buffer-face-mode 1))


@@ -131,19 +150,18 @@
          (overlay-put spray--accent-overlay 'face 'spray-accent-face)
          (spray-start))
         (t
          (overlay-put spray--accent-overlay 'face 'spray-accent-face)
          (spray-start))
         (t

-         (and spray--saved-smartparens-enabled (smartparens-mode 1))
-         (setq cursor-type spray--saved-cursor-type)
+         (spray-stop)
+         (delete-overlay spray--accent-overlay)
+         (delete-overlay spray--base-overlay)
+         (buffer-face-mode -1)

          (if spray--saved-restriction
              (narrow-to-region (car spray--saved-restriction)
                                (cdr spray--saved-restriction))
            (widen))
          (if spray--saved-restriction
              (narrow-to-region (car spray--saved-restriction)
                                (cdr spray--saved-restriction))
            (widen))

-         (buffer-face-mode -1)
-         (if spray--saved-buffer-face
-             (let ((buffer-face-mode-face spray--saved-buffer-face))
-               (buffer-face-mode 1)))
-         (delete-overlay spray--base-overlay)
-         (delete-overlay spray--accent-overlay)
-         (spray-stop))))
+         (setq cursor-type spray--saved-cursor-type)
+         (dolist (mode spray--saved-minor-modes)
+           (funcall mode 1))
+         (setq spray--saved-minor-modes nil))))

 
 (defun spray-quit ()
   "Exit spray mode."
 
 (defun spray-quit ()
   "Exit spray mode."


@@ -151,9 +169,9 @@
   (spray-mode -1))
 
 (defun spray--word-at-point ()
   (spray-mode -1))
 
 (defun spray--word-at-point ()

-  (skip-chars-backward "^\s\t\n")
+  (skip-chars-backward "^\s\t\n—")

   (let* ((beg (point))
   (let* ((beg (point))

-         (len (skip-chars-forward "^\s\t\n"))
+         (len (+ (skip-chars-forward "^\s\t\n—") (skip-chars-forward "—")))

          (end (point))
          (accent (+ beg (cl-case len
                        ((1) 1)
          (end (point))
          (accent (+ beg (cl-case len
                        ((1) 1)


@@ -161,11 +179,15 @@
                        ((6 7 8 9) 3)
                        ((10 11 12 13) 4)
                        (t 5)))))
                        ((6 7 8 9) 3)
                        ((10 11 12 13) 4)
                        (t 5)))))

+    ;; this fairly obfuscated, using magic numbers to store state
+    ;; it would be nice to sometime patch this so it is more readable.
+    ;; for greater than 9 length, we display for twice as long
+    ;; for some punctuation, we display a blank

     (setq spray--delay (+ (if (> len 9) 1 0)
                           (if (looking-at "\n[\s\t\n]") 3 0)
                           (cl-case (char-before)
                             ((?. ?! ?\? ?\;) 3)
     (setq spray--delay (+ (if (> len 9) 1 0)
                           (if (looking-at "\n[\s\t\n]") 3 0)
                           (cl-case (char-before)
                             ((?. ?! ?\? ?\;) 3)

-                            ((?, ?:) 1)
+                            ((?, ?: ?—) 1)

                             (t 0))))
     (move-overlay spray--accent-overlay (1- accent) accent)
     (move-overlay spray--base-overlay beg end)
                             (t 0))))
     (move-overlay spray--accent-overlay (1- accent) accent)
     (move-overlay spray--base-overlay beg end)


@@ -176,7 +198,9 @@
     (narrow-to-region beg end)))
 
 (defun spray--update ()
     (narrow-to-region beg end)))
 
 (defun spray--update ()

-  (cond ((not (zerop spray--delay))
+  (cond ((not (zerop spray--initial-delay))
+         (setq spray--initial-delay (1- spray--initial-delay)))
+        ((not (zerop spray--delay))

          (setq spray--delay (1- spray--delay))
          (when (= spray--delay 2)
            (narrow-to-region (point) (point))))
          (setq spray--delay (1- spray--delay))
          (when (= spray--delay 2)
            (narrow-to-region (point) (point))))


@@ -184,7 +208,10 @@
          (widen)
          (if (eobp)
              (spray-mode -1)
          (widen)
          (if (eobp)
              (spray-mode -1)

-           (skip-chars-forward "\s\t\n")
+           (when (not (zerop spray--first-words))
+             (setq spray--initial-delay spray--first-words)
+             (setq spray--first-words (1- spray--first-words)))
+           (skip-chars-forward "\s\t\n—")

            (spray--word-at-point)))))
 
 ;; * interactive commands
            (spray--word-at-point)))))
 
 ;; * interactive commands


@@ -206,30 +233,30 @@ Returns t if spray was unpaused."
 (defun spray-start ()
   "Start / resume spray."
   (interactive)
 (defun spray-start ()
   "Start / resume spray."
   (interactive)

+  (setq spray--first-words spray-ramp)

   (setq spray--running
         (run-with-timer 0 (/ 60.0 spray-wpm) 'spray--update)))
 
   (setq spray--running
         (run-with-timer 0 (/ 60.0 spray-wpm) 'spray--update)))
 

-

 (defun spray-forward-word ()
   (interactive)
   (spray-stop)
   (widen)
 (defun spray-forward-word ()
   (interactive)
   (spray-stop)
   (widen)

-  (skip-chars-forward "\s\t\n")
+  (skip-chars-forward "\s\t\n—")

   (spray--word-at-point))
 
 (defun spray-backward-word ()
   (interactive)
   (spray-stop)
   (widen)
   (spray--word-at-point))
 
 (defun spray-backward-word ()
   (interactive)
   (spray-stop)
   (widen)

-  (skip-chars-backward "^\s\t\n")
-  (skip-chars-backward "\s\t\n")
+  (skip-chars-backward "^\s\t\n—")
+  (skip-chars-backward "\s\t\n—")

   (spray--word-at-point))
 
 (defun spray-faster ()
   "Increases speed.
 
 Increases the wpm (words per minute) parameter. See the variable
   (spray--word-at-point))
 
 (defun spray-faster ()
   "Increases speed.
 
 Increases the wpm (words per minute) parameter. See the variable

-`spray-wmp'."
+`spray-wpm'."

   (interactive)
   (spray-inc-wpm 20))
 
   (interactive)
   (spray-inc-wpm 20))
 


@@ -237,7 +264,7 @@ Increases the wpm (words per minute) parameter. See the variable
   "Decreases speed.
 
 Decreases the wpm (words per minute) parameter. See the variable
   "Decreases speed.
 
 Decreases the wpm (words per minute) parameter. See the variable

-`spray-wmp'."
+`spray-wpm'."

   (interactive)
   (spray-inc-wpm -20))
 
   (interactive)
   (spray-inc-wpm -20))