Changeset dcfd422 in mainline for uspace/lib

Timestamp:

2020-10-23T13:45:18Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5a43bd0

Parents:

26653c9

git-author:

Jiri Svoboda <jiri@…> (2020-10-22 19:44:59)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-23 13:45:18)

Message:

Decorate terminal window

Location:

uspace/lib/ui

Files:

• include/ui/wdecor.h (modified) (1 diff)
• src/wdecor.c (modified) (1 diff)
• test/wdecor.c (modified) (2 diffs)

uspace/lib/ui/include/ui/wdecor.h

@@ -52 +52 @@
 extern errno_t ui_wdecor_paint(ui_wdecor_t *);
 extern void ui_wdecor_pos_event(ui_wdecor_t *, pos_event_t *);
+extern void ui_wdecor_rect_from_app(gfx_rect_t *, gfx_rect_t *);
 
 #endif

uspace/lib/ui/src/wdecor.c

@@ -271 +271 @@
 }
 
+/** Get outer rectangle from application area rectangle.
+ *
+ * Note that this needs to work just based on a UI, without having an actual
+ * window decoration, since we need it in order to create the window
+ * and its decoration.
+ *
+ * @param app Application area rectangle
+ * @param rect Place to store (outer) window decoration rectangle
+ */
+void ui_wdecor_rect_from_app(gfx_rect_t *app, gfx_rect_t *rect)
+{
+        rect->p0.x = app->p0.x - 4;
+        rect->p0.y = app->p0.y - 22 - 4;
+        rect->p1.x = app->p1.x + 4;
+        rect->p1.y = app->p1.y + 4;
+}
+
 /** Handle window decoration position event.
  *

uspace/lib/ui/test/wdecor.c

@@ -310 +310 @@
 }
 
+/** ui_wdecor_get_geom() produces the correct geometry */
 PCUT_TEST(get_geom)
 {
@@ -349 +350 @@
 
         ui_wdecor_destroy(wdecor);
+}
+
+/** ui_wdecor_rect_from_app() correctly converts application to window rect */
+PCUT_TEST(rect_from_app)
+{
+        gfx_rect_t arect;
+        gfx_rect_t rect;
+
+        arect.p0.x = 14;
+        arect.p0.y = 46;
+        arect.p1.x = 96;
+        arect.p1.y = 196;
+
+        ui_wdecor_rect_from_app(&arect, &rect);
+
+        PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(20, rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(100, rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(200, rect.p1.y);
 }