Allow editing text input fields again

(eww-process-text-input): New function to make text input field editing
work.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a64828..b96d414 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
        relying in widget.el.  Using widget.el leads to too many
        user interface inconsistencies.
        (eww-self-insert): Implement entering commands in text fields.
+       (eww-process-text-input): New function to make text input field editing
+       work.
 
        * shr.el (shr-urlify): Use `keymap' instead of `local-map' so that we
        don't shadow mode-specific bindings.

diff --git a/lisp/eww.el b/lisp/eww.el
index 1756198..e245927 100644 (file)
--- a/lisp/eww.el
+++ b/lisp/eww.el
@@ -178,6 +178,7 @@
     (setq eww-current-url url)
     (eww-update-header-line-format)
     (let ((inhibit-read-only t)
+         (after-change-functions nil)
          (shr-width nil)
          (shr-external-rendering-functions
           '((title . eww-tag-title)
@@ -292,7 +293,9 @@
 \\{eww-mode-map}"
   (set (make-local-variable 'eww-current-url) 'author)
   (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url)
-  (setq buffer-read-only t))
+  (set (make-local-variable 'after-change-functions) 'eww-process-text-input)
+  ;;(setq buffer-read-only t)
+  )
 
 (defun eww-browse-url (url &optional new-window)
   (when (and (equal major-mode 'eww-mode)
@@ -374,13 +377,12 @@ or <a> tag."
 
 (defvar eww-text-map
   (let ((map (make-keymap)))
-    (suppress-keymap map)
     (set-keymap-parent map text-mode-map)
-    (substitute-key-definition
-     'undefined 'eww-self-insert map)
     (define-key map "\r" 'eww-submit)
     (define-key map [(control a)] 'eww-beginning-of-text)
     (define-key map [(control e)] 'eww-end-of-text)
+    (define-key map [tab] 'shr-next-link)
+    (define-key map [backtab] 'shr-previous-link)
     map))
 
 (defun eww-beginning-of-text ()
@@ -392,13 +394,18 @@ or <a> tag."
 (defun eww-end-of-text ()
   "Move to the end of the text in the input field."
   (interactive)
-  (goto-char (1- (next-single-property-change
-                 (point) 'eww-form nil (point-max))))
+  (goto-char (eww-end-of-field))
   (let ((start (previous-single-property-change
                (point) 'eww-form nil (point-min))))
     (while (and (equal (following-char) ? )
                (> (point) start))
-      (forward-char -1))))
+      (forward-char -1))
+    (when (> (point) start)
+      (forward-char 1))))
+
+(defun eww-end-of-field ()
+  (1- (next-single-property-change
+       (point) 'eww-form nil (point-max))))
 
 (defun eww-self-insert ()
   "Insert the character you type."
@@ -475,12 +482,36 @@ or <a> tag."
       (insert (make-string (- width (length value)) ? )))
     (put-text-property start (point) 'face 'eww-form-text)
     (put-text-property start (point) 'local-map eww-text-map)
+    (put-text-property start (point) 'inhibit-read-only t)
     (put-text-property start (point) 'eww-form
                       (list :eww-form eww-form
                             :value value
                             :type type
                             :name (cdr (assq :name cont))))))
 
+(defun eww-process-text-input (beg end length)
+  (let ((form (get-text-property end 'eww-form))
+       (properties (text-properties-at end)))
+    (when form
+      (cond
+       ((zerop length)
+       ;; Delete some text
+       (save-excursion
+         (goto-char (eww-end-of-field))
+         (let ((new (- end beg)))
+           (while (and (> new 0)
+                       (eql (following-char) ? ))
+             (delete-region (point) (1+ (point)))
+             (setq new (1- new))))
+         (set-text-properties beg end properties)))
+       ((> length 0)
+       ;; Add padding.
+       (save-excursion
+         (goto-char (1+ (eww-end-of-field)))
+         (let ((start (point)))
+           (insert (make-string length ? ))
+           (set-text-properties start (point) properties))))))))
+
 (defun eww-form-textarea (cont)
   (let ((start (point))
        (value (or (cdr (assq :value cont)) ""))