X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=spray.el;h=836cf07ff3137bbef25c568ab0244a492f325c2c;hb=a07d2e2ea239d6d1c7f44a221972a07ef4e14a6d;hp=bb0ea2c0d68677286b7e59c38b8a6c173b47fbe4;hpb=393b04a8e7fc11e063bff0e56acfc835884ebd87;p=spray

diff --git a/spray.el b/spray.el
index bb0ea2c..836cf07 100644
--- a/spray.el
+++ b/spray.el
@@ -35,6 +35,10 @@
 ;;
 ;; 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.
+
 ;;; Change Log:
 ;; 0.0.0 test release
 ;; 0.0.1 add spray-set-margins
@@ -49,7 +53,7 @@
 (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-margin-left 1 "character margin at left of buffer. Characters are as big as spray text characters.")
 
 (defvar spray-mode-map
   (let ((km (make-sparse-keymap)))
@@ -59,6 +63,7 @@
     (define-key km (kbd "<left>") 'spray-backward-word)
     (define-key km (kbd "<right>") 'spray-forward-word)
     (define-key km (kbd "f") 'spray-faster)
+    (define-key km (kbd "s") 'spray-slower)
     (define-key km (kbd "q") 'spray-quit)
     (define-key km (kbd "<return>") 'spray-quit)
     km)
@@ -84,12 +89,13 @@
 (defvar spray--margin-string ""
   "Currently not used.")
 (defvar spray--base-overlay nil)
-(defvar spray--orp-overlay nil)
+(defvar spray--accent-overlay nil)
 (defvar spray--running 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-smartparens-enabled nil)
 
 ;; * utility functions
 
@@ -108,22 +114,32 @@
   :keymap spray-mode-map
   (cond (spray-mode
          (setq spray--base-overlay (make-overlay (point-min) (point-max))
-               spray--orp-overlay (make-overlay 0 0)
+               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))
+                                             buffer-face-mode-face)
+               spray--saved-smartparens-enabled (and (boundp 'smartparens-mode)
+                                                     smartparens-mode)
+               spray--saved-highlight-symbol-enabled (and (boundp 'highlight-symbol-mode)
+                                                     highlight-symbol-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))
+         (and spray--saved-highlight-symbol-enabled (highlight-symbol-mode -1))
          (setq cursor-type nil)
          (let ((buffer-face-mode-face `(:height ,spray-height)))
            (buffer-face-mode 1))
          (overlay-put spray--base-overlay 'priority 100)
          (overlay-put spray--base-overlay 'face 'spray-base-face)
-         (overlay-put spray--orp-overlay 'priority 101)
-         (overlay-put spray--orp-overlay 'face 'spray-accent-face)
+         (overlay-put spray--accent-overlay 'priority 101)
+         (overlay-put spray--accent-overlay 'face 'spray-accent-face)
          (spray-start))
         (t
+         (and spray--saved-smartparens-enabled (smartparens-mode 1))
+         (and spray--saved-highlight-symbol-enabled (highlight-symbol-mode 1))
          (setq cursor-type spray--saved-cursor-type)
          (if spray--saved-restriction
              (narrow-to-region (car spray--saved-restriction)
@@ -134,7 +150,7 @@
              (let ((buffer-face-mode-face spray--saved-buffer-face))
                (buffer-face-mode 1)))
          (delete-overlay spray--base-overlay)
-         (delete-overlay spray--orp-overlay)
+         (delete-overlay spray--accent-overlay)
          (spray-stop))))
 
 (defun spray-quit ()
@@ -147,24 +163,28 @@
   (let* ((beg (point))
          (len (skip-chars-forward "^\s\t\n"))
          (end (point))
-         (orp (+ beg (cl-case len
+         (accent (+ beg (cl-case len
                        ((1) 1)
                        ((2 3 4 5) 2)
                        ((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)
                             ((?, ?:) 1)
                             (t 0))))
-    (move-overlay spray--orp-overlay (1- orp) orp)
+    (move-overlay spray--accent-overlay (1- accent) accent)
     (move-overlay spray--base-overlay beg end)
     (spray-set-margins)
     (overlay-put spray--base-overlay 'before-string
                  (concat spray--margin-string
-                         (make-string (- 5 (- orp beg)) ?\s)))
+                         (make-string (- 5 (- accent beg)) ?\s)))
     (narrow-to-region beg end)))
 
 (defun spray--update ()