Changeset f7a8052 in mainline

Timestamp:

2022-02-08T12:22:28Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0436aec

Parents:

7eec25fc

git-author:

Jiri Svoboda <jiri@…> (2022-02-07 18:22:17)

git-committer:

Jiri Svoboda <jiri@…> (2022-02-08 12:22:28)

Message:

Account for scrolling while initially printing prompt and text

File:

• uspace/lib/clui/tinput.c (modified) (3 diffs)

uspace/lib/clui/tinput.c

@@ -172 +172 @@
 }
 
-/** Update text_coord, prompt_coord in case the screen could have scrolled. */
-static void tinput_update_origin(tinput_t *ti)
-{
-        unsigned end_coord = ti->text_coord + ti->nc;
+/** Update text_coord, prompt_coord in case the screen would scroll
+ * due to @a end_coord being beyond the end of the screen
+ *
+ * @param ti Text input
+ * @param end_coord Linear screen coordinate to which the cursor would
+ *                  be moved if the screen would not have scrolled
+ */
+static void tinput_update_origin_coord(tinput_t *ti, unsigned end_coord)
+{
         unsigned end_row = LIN_TO_ROW(ti, end_coord);
 
@@ -188 +193 @@
 }
 
+/** Update text_coord, prompt_coord in case the screen could have scrolled. */
+static void tinput_update_origin(tinput_t *ti)
+{
+        /* Account for scrolling until the end of the input text */
+        tinput_update_origin_coord(ti, ti->text_coord + ti->nc);
+}
+
 static void tinput_jump_after(tinput_t *ti)
 {
@@ -203 +215 @@
 
         ti->prompt_coord = row0 * ti->con_cols + col0;
+        ti->text_coord = ti->prompt_coord;
+        tinput_display_prompt(ti);
+
+        /* The screen might have scrolled after priting the prompt */
+        tinput_update_origin_coord(ti, ti->prompt_coord + str_width(ti->prompt));
+
         ti->text_coord = ti->prompt_coord + str_length(ti->prompt);
-
-        tinput_display_prompt(ti);
         tinput_display_tail(ti, 0, 0);
+
+        /* The screen might have scrolled after priting the text */
+        tinput_update_origin(ti);
+
         tinput_position_caret(ti);