Commit ed7864c3 authored by David O'Toole's avatar David O'Toole

fix shell prompt not highlightingc

parent 8d0a2443
......@@ -18,7 +18,7 @@
(z-sort-p :initform t :initarg :z-sort-p :accessor z-sort-p
:documentation "When non-nil, draw objects in correct Z-order.")
(selection :initform nil)
(buffer-name :initform "*untitled-buffer*" :accessor buffer-name :initarg :buffer-name)
(buffer-name :initform nil :accessor buffer-name :initarg :buffer-name)
(variables :initform nil :accessor variables :initarg :variables)
(point :initform nil)
(modified-p :initform nil)
......@@ -607,7 +607,7 @@
(setf (slot-value self 'point) (find-uuid point)))
;; Buffer point:1 ends here
;; Drawing the buffer
;; TODO Drawing the buffer
;; [[file:~/quicklisp/local-projects/xelf/gui.org::*Drawing%20the%20buffer][Drawing the buffer:1]]
......@@ -665,7 +665,7 @@
(draw drag))
(when focused-block
(when (find-object focused-block :noerror)
(draw-focus (find-object focused-block)))))))
(draw-focus (find-object focused-block)))))))
;; Drawing the buffer:1 ends here
;; Automatic resizing to an image
......@@ -2285,7 +2285,7 @@ See sidebar for more commands to try.
(defmethod draw :after ((self prompt))
(when *notification*
(layout *notification*))
(draw *notification*))
(let ((text (find-instances 'text (current-buffer))))
(when text
(mapc #'draw text))))
......
......@@ -70,7 +70,7 @@ every BUFFER is also a NODE.)
(z-sort-p :initform t :initarg :z-sort-p :accessor z-sort-p
:documentation "When non-nil, draw objects in correct Z-order.")
(selection :initform nil)
(buffer-name :initform "*untitled-buffer*" :accessor buffer-name :initarg :buffer-name)
(buffer-name :initform nil :accessor buffer-name :initarg :buffer-name)
(variables :initform nil :accessor variables :initarg :variables)
(point :initform nil)
(modified-p :initform nil)
......@@ -639,7 +639,7 @@ This section is obsolete and will be removed in the future.
(setf (slot-value self 'point) (find-uuid point)))
#+end_src
** Drawing the buffer
** TODO Drawing the buffer
#+begin_src lisp
(defmethod grab-focus ((self buffer)))
......@@ -696,7 +696,7 @@ This section is obsolete and will be removed in the future.
(draw drag))
(when focused-block
(when (find-object focused-block :noerror)
(draw-focus (find-object focused-block)))))))
(draw-focus (find-object focused-block)))))))
#+end_src
** Automatic resizing to an image
......@@ -2300,7 +2300,7 @@ above.
(defmethod draw :after ((self prompt))
(when *notification*
(layout *notification*))
(draw *notification*))
(let ((text (find-instances 'text (current-buffer))))
(when text
(mapc #'draw text))))
......@@ -4536,6 +4536,11 @@ supported compiler.
(setf *menubar* (make-instance 'menubar))
(setf *system* (make-instance 'system)))
(defmethod draw :after ((self shell))
(let ((focus (slot-value (current-buffer) 'focused-block)))
(when (xelfp focus)
(draw-focus (find-object focus)))))
(defun create-shell-maybe ()
(when (null *shell*)
(setf *shell* (make-instance 'shell))))
......
......@@ -235,6 +235,11 @@
(setf *menubar* (make-instance 'menubar))
(setf *system* (make-instance 'system)))
(defmethod draw :after ((self shell))
(let ((focus (slot-value (current-buffer) 'focused-block)))
(when (xelfp focus)
(draw-focus (find-object focus)))))
(defun create-shell-maybe ()
(when (null *shell*)
(setf *shell* (make-instance 'shell))))
......
* Task list
** TODO switch to dialog boxes not being in buffer
** TODO fix dialog boxes
*** TODO [#B] fix *untitled-buffer* not being added to list
*** TODO [#A] context-menu with reset-to-current-values
**** TODO pin down context menu elements
**** TODO fix broken layout/rendering of context menu
*** TODO [#A] fix menubar not being in switched-to buffer to respond to clicks
*** TODO [#A] project properties: height width scale-output- resizable author title license frame-rate
*** TODO [#B] close after eval if frame
*** TODO [#B] add more notifications for cut/copy etc
......@@ -795,3 +794,13 @@
CLOSED: [2017-04-21 Fri 08:15]
*** DONE fix clicks/focus
CLOSED: [2017-04-21 Fri 08:39]
** DONE [#A] fix shell prompt not highlighting in switched-to buffer
CLOSED: [2017-04-21 Fri 13:53]
:PROPERTIES:
:ARCHIVE_TIME: 2017-04-21 Fri 13:53
:ARCHIVE_FILE: ~/xelf/tasks.org
:ARCHIVE_OLPATH: Task list/fix dialog boxes
:ARCHIVE_CATEGORY: tasks
:ARCHIVE_TODO: DONE
:END:
......@@ -65,9 +65,10 @@
(trace xelf::open-shell)
(trace xelf::focus-on)
(trace xelf::close-shell)
(trace xelf::drag-candidate)
(trace xelf::drag-maybe)
(trace xelf::drag-fail)
(trace xelf::hit-inputs)
;; (trace xelf::drag-candidate)
;; (trace xelf::drag-maybe)
;; (trace xelf::drag-fail)
;; (trace xelf::hit-inputs)
;; (trace xelf::draw-focus)
(test-gui)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment