X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=spray.el;h=48819cb12ad2d42ea97c30bf760044f195ce00ef;hb=9f3a3bd2793955083a394d2e527209bc273e0d57;hp=361e0490cb0d0af45f85e9cdf4088d175b564d0f;hpb=19017e3d79de794de7654d66033fa8cf5b276599;p=spray

diff --git a/spray.el b/spray.el
index 361e049..48819cb 100644
--- a/spray.el
+++ b/spray.el
@@ -18,7 +18,7 @@
 
 ;; Author: zk_phi
 ;; URL: http://hins11.yu-yake.com/
-;; Version: 0.0.0
+;; Version: 0.0.1
 
 ;;; Commentary:
 
@@ -36,6 +36,7 @@
 
 ;;; Change Log:
 ;; 0.0.0 test release
+;; 0.0.1 add spray-set-margins
 
 ;;; Code:
 
@@ -53,6 +54,8 @@
     (define-key km (kbd "l") 'spray-forward-word)
     (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)
     km)
   "keymap for spray-mode buffers")
 
@@ -71,6 +74,7 @@
 
 ;; * internal vars
 
+(defvar spray--margin-string "")
 (defvar spray--base-overlay nil)
 (defvar spray--orp-overlay nil)
 (defvar spray--running nil)
@@ -79,6 +83,14 @@
 (defvar spray--saved-buffer-face nil)
 (defvar spray--saved-restriction nil)
 
+;; * utility functions
+
+(defun spray-set-margins (left above)
+  "add margins before/above the spray text. each arguments can be
+an integer or a float value."
+  (setq spray--margin-string
+        (propertize " " 'display `((space-width ,left) (height ,(1+ above))))))
+
 ;; * the mode
 
 ;;;###autoload
@@ -120,8 +132,7 @@
          (spray-start/stop -1))))
 
 (defun spray--pre-command-handler ()
-  (unless (memq this-command
-                '(spray-forward-word spray-backward-word spray-start/stop))
+  (unless (string-match "^spray-" (symbol-name this-command))
     (spray-mode -1)))
 
 (defun spray--word-at-point ()
@@ -143,8 +154,9 @@
                             (t 0))))
     (move-overlay spray--orp-overlay (1- orp) orp)
     (move-overlay spray--base-overlay beg end)
-    (overlay-put spray--base-overlay
-                 'before-string (make-string (- 5 (- orp beg)) ?\s))
+    (overlay-put spray--base-overlay 'before-string
+                 (concat spray--margin-string
+                         (make-string (- 5 (- orp beg)) ?\s)))
     (narrow-to-region beg end)))
 
 (defun spray--update ()
@@ -188,6 +200,32 @@
   (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-wmp'."
+  (interactive)
+  (spray-inc-wpm 20))
+
+(defun spray-slower ()
+  "Decreases speed.
+
+Decreases the wpm (words per minute) parameter. See the variable
+`spray-wmp'."
+  (interactive)
+  (spray-inc-wpm -20))
+
+(defun spray-inc-wpm (delta)
+  (let ((was-running spray--running))
+    (spray-start/stop -1)
+    (when (< 10 (+ spray-wpm delta))
+      (setq spray-wpm (+ spray-wpm delta)))
+    (spray-backward-word)
+    (message "spray wpm: %d" spray-wpm)
+    (when was-running
+      (spray-start/stop 1))))
+
 ;; * provide
 
 (provide 'spray)