Merge pull request #854 from lem-project/refactor-redraw-functions

Graphical text buffer

frontends/sdl2/lem-sdl2.asd

@@ -11,5 +11,6 @@
                (:file "font")
                (:file "icon")
                (:file "main")
+               (:file "text-buffer")
                (:file "image-buffer")
                (:file "tree")))

frontends/sdl2/main.lisp

@@ -559,7 +559,25 @@
     :reader view-use-modeline)
    (texture
     :initarg :texture
-    :accessor view-texture)))
+    :accessor view-texture)
+   (last-cursor-x
+    :initform nil
+    :accessor view-last-cursor-x)
+   (last-cursor-y
+    :initform nil
+    :accessor view-last-cursor-y)))
+
+(defmethod last-cursor-x ((view view))
+  (or (view-last-cursor-x view)
+      ;; fallback to v1
+      (* (lem:last-print-cursor-x (view-window view))
+         (char-width))))
+
+(defmethod last-cursor-y ((view view))
+  (or (view-last-cursor-y view)
+      ;; fallback to v1
+      (* (lem:last-print-cursor-y (view-window view))
+         (char-height))))
 
 (defun create-view (window x y width height use-modeline)
   (when use-modeline (incf height))
@@ -998,13 +1016,13 @@
 
 (defun set-input-method ()
   (let* ((view (lem:window-view (lem:current-window)))
-         (cursor-x (lem:last-print-cursor-x (lem:current-window)))
-         (cursor-y (lem:last-print-cursor-y (lem:current-window)))
+         (cursor-x (last-cursor-x view))
+         (cursor-y (last-cursor-y view))
          (text lem-sdl2/keyboard::*textediting-text*)
          (x (+ (* (view-x view) (char-width))
-               (* cursor-x (char-width))))
+               cursor-x))
          (y (+ (* (view-y view) (char-height))
-               (* cursor-y (char-height)))))
+               cursor-y)))
     (sdl2:with-rects ((rect x y (* (char-width) (lem:string-width text)) (char-height)))
       (sdl2-ffi.functions:sdl-set-text-input-rect rect)
       (when (plusp (length text))