Changeset 1769693 in mainline

Timestamp:

2020-10-19T20:17:11Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba09d06

Parents:

de9992c

Message:

Window decoration

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (10 diffs)
• app/uidemo/uidemo.h (modified) (1 diff)
• lib/ui/include/types/ui/wdecor.h (added)
• lib/ui/include/ui/wdecor.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/pbutton.h (modified) (1 diff)
• lib/ui/private/resource.h (modified) (1 diff)
• lib/ui/private/wdecor.h (added)
• lib/ui/src/resource.c (modified) (5 diffs)
• lib/ui/src/wdecor.c (added)
• lib/ui/test/main.c (modified) (1 diff)
• lib/ui/test/wdecor.c (added)

uspace/app/uidemo/uidemo.c

@@ -42 +42 @@
 #include <ui/pbutton.h>
 #include <ui/resource.h>
+#include <ui/wdecor.h>
 #include "uidemo.h"
 
 static void wnd_close_event(void *);
+static void wnd_focus_event(void *);
 static void wnd_kbd_event(void *, kbd_event_t *);
 static void wnd_pos_event(void *, pos_event_t *);
+static void wnd_unfocus_event(void *);
 
 static display_wnd_cb_t wnd_cb = {
         .close_event = wnd_close_event,
+        .focus_event = wnd_focus_event,
         .kbd_event = wnd_kbd_event,
-        .pos_event = wnd_pos_event
+        .pos_event = wnd_pos_event,
+        .unfocus_event = wnd_unfocus_event
 };
 
@@ -60 +65 @@
 };
 
+static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
+
+static ui_wdecor_cb_t wdecor_cb = {
+        .move = wd_move
+};
+
 static bool quit = false;
 
@@ -73 +84 @@
         printf("Close event\n");
         quit = true;
+}
+
+/** Handle window focus event. */
+static void wnd_focus_event(void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        if (demo->wdecor != NULL) {
+                ui_wdecor_set_active(demo->wdecor, true);
+                ui_wdecor_paint(demo->wdecor);
+        }
 }
 
@@ -88 +110 @@
         ui_demo_t *demo = (ui_demo_t *) arg;
 
+        /* Make sure we don't process events until fully initialized */
+        if (demo->wdecor == NULL || demo->pb1 == NULL || demo->pb2 == NULL)
+                return;
+
+        ui_wdecor_pos_event(demo->wdecor, event);
         ui_pbutton_pos_event(demo->pb1, event);
         ui_pbutton_pos_event(demo->pb2, event);
+}
+
+/** Handle window unfocus event. */
+static void wnd_unfocus_event(void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        if (demo->wdecor != NULL) {
+                ui_wdecor_set_active(demo->wdecor, false);
+                ui_wdecor_paint(demo->wdecor);
+        }
 }
 
@@ -106 +144 @@
                 printf("Clicked 'Cancel' button\n");
         }
+}
+
+/** Window decoration requested window move.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (demo)
+ * @param pos Position where the title bar was pressed
+ */
+static void wd_move(ui_wdecor_t *wdecor, void *arg, gfx_coord2_t *pos)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) display_window_move_req(demo->dwindow, pos);
 }
 
@@ -135 +186 @@
         params.rect.p1.y = 100;
 
+        memset((void *) &demo, 0, sizeof(demo));
+
         rc = display_window_create(display, &params, &wnd_cb, (void *) &demo,
             &window);
@@ -142 +195 @@
         }
 
+        demo.dwindow = window;
+
         rc = display_window_get_gc(window, &gc);
         if (rc != EOK) {
@@ -155 +210 @@
                 return rc;
         }
+
+        printf("Create window decoration\n");
+        rc = ui_wdecor_create(ui_res, "UI Demo", &demo.wdecor);
+        if (rc != EOK) {
+                printf("Error creating window decoration.\n");
+                return rc;
+        }
+
+        ui_wdecor_set_rect(demo.wdecor, &params.rect);
+        ui_wdecor_set_cb(demo.wdecor, &wdecor_cb, (void *) &demo);
 
         rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
@@ -207 +272 @@
         color = NULL;
 
+        rc = ui_wdecor_paint(demo.wdecor);
+        if (rc != EOK) {
+                printf("Error painting window decoration.\n");
+                return rc;
+        }
+
         rc = ui_pbutton_paint(demo.pb1);
         if (rc != EOK) {
@@ -223 +294 @@
         }
 
+        ui_wdecor_destroy(demo.wdecor);
         ui_pbutton_destroy(demo.pb1);
         ui_pbutton_destroy(demo.pb2);

uspace/app/uidemo/uidemo.h

@@ -37 +37 @@
 #define UIDEMO_H
 
+#include <display.h>
+#include <ui/pbutton.h>
+#include <ui/wdecor.h>
+
 /** User interface demo */
 typedef struct {
+        display_window_t *dwindow;
+        ui_wdecor_t *wdecor;
         ui_pbutton_t *pb1;
         ui_pbutton_t *pb2;

uspace/lib/ui/meson.build

@@ -32 +32 @@
         'src/pbutton.c',
         'src/resource.c',
+        'src/wdecor.c'
 )
 
@@ -39 +40 @@
         'test/pbutton.c',
         'test/resource.c',
+        'test/wdecor.c',
 )

uspace/lib/ui/private/pbutton.h

@@ -38 +38 @@
 #define _UI_PRIVATE_PBUTTON_H
 
-#include <gfx/context.h>
 #include <gfx/coord.h>
 #include <stdbool.h>

uspace/lib/ui/private/resource.h

@@ -65 +65 @@
         /** Button shadow color */
         gfx_color_t *btn_shadow_color;
+
+        /** Window face color */
+        gfx_color_t *wnd_face_color;
+        /** Window text color */
+        gfx_color_t *wnd_text_color;
+        /** Window frame hightlight color */
+        gfx_color_t *wnd_frame_hi_color;
+        /** Window frame shadow color */
+        gfx_color_t *wnd_frame_sh_color;
+        /** Window highlight color */
+        gfx_color_t *wnd_highlight_color;
+        /** Window shadow color */
+        gfx_color_t *wnd_shadow_color;
+
+        /** Active titlebar background color */
+        gfx_color_t *tbar_act_bg_color;
+        /** Active titlebar text color */
+        gfx_color_t *tbar_act_text_color;
+        /** Inactive titlebar background color */
+        gfx_color_t *tbar_inact_bg_color;
+        /** Inactive titlebar text color */
+        gfx_color_t *tbar_inact_text_color;
 };
 

uspace/lib/ui/src/resource.c

@@ -64 +64 @@
         gfx_color_t *btn_highlight_color = NULL;
         gfx_color_t *btn_shadow_color = NULL;
+        gfx_color_t *wnd_face_color = NULL;
+        gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_frame_hi_color = NULL;
+        gfx_color_t *wnd_frame_sh_color = NULL;
+        gfx_color_t *wnd_highlight_color = NULL;
+        gfx_color_t *wnd_shadow_color = NULL;
+        gfx_color_t *tbar_act_bg_color = NULL;
+        gfx_color_t *tbar_inact_bg_color = NULL;
+        gfx_color_t *tbar_act_text_color = NULL;
+        gfx_color_t *tbar_inact_text_color = NULL;
         errno_t rc;
 
@@ -105 +115 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &wnd_face_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x8888, 0x8888, 0x8888, &wnd_frame_hi_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_frame_sh_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
+            &wnd_highlight_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x8888, 0x8888, 0x8888, &wnd_shadow_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x5858, 0x6a6a, 0xc4c4, &tbar_act_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
+            &tbar_act_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xdddd, 0xdddd, 0xdddd,
+            &tbar_inact_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
+            &tbar_inact_text_color);
+        if (rc != EOK)
+                goto error;
+
         resource->gc = gc;
         resource->tface = tface;
         resource->font = font;
+
         resource->btn_frame_color = btn_frame_color;
         resource->btn_face_color = btn_face_color;
@@ -113 +168 @@
         resource->btn_highlight_color = btn_highlight_color;
         resource->btn_shadow_color = btn_shadow_color;
+
+        resource->wnd_face_color = wnd_face_color;
+        resource->wnd_text_color = wnd_text_color;
+        resource->wnd_frame_hi_color = wnd_frame_hi_color;
+        resource->wnd_frame_sh_color = wnd_frame_sh_color;
+        resource->wnd_highlight_color = wnd_highlight_color;
+        resource->wnd_shadow_color = wnd_shadow_color;
+
+        resource->tbar_act_bg_color = tbar_act_bg_color;
+        resource->tbar_act_text_color = tbar_act_text_color;
+        resource->tbar_inact_bg_color = tbar_inact_bg_color;
+        resource->tbar_inact_text_color = tbar_inact_text_color;
+
         *rresource = resource;
         return EOK;
@@ -126 +194 @@
         if (btn_shadow_color != NULL)
                 gfx_color_delete(btn_shadow_color);
+
+        if (wnd_face_color != NULL)
+                gfx_color_delete(wnd_face_color);
+        if (wnd_text_color != NULL)
+                gfx_color_delete(wnd_text_color);
+        if (wnd_frame_hi_color != NULL)
+                gfx_color_delete(wnd_frame_hi_color);
+        if (wnd_frame_sh_color != NULL)
+                gfx_color_delete(wnd_frame_sh_color);
+        if (wnd_highlight_color != NULL)
+                gfx_color_delete(wnd_highlight_color);
+        if (wnd_shadow_color != NULL)
+                gfx_color_delete(wnd_shadow_color);
+
+        if (tbar_act_bg_color != NULL)
+                gfx_color_delete(tbar_act_bg_color);
+        if (tbar_act_text_color != NULL)
+                gfx_color_delete(tbar_act_text_color);
+        if (tbar_inact_bg_color != NULL)
+                gfx_color_delete(tbar_inact_bg_color);
+        if (tbar_inact_text_color != NULL)
+                gfx_color_delete(tbar_inact_text_color);
+
         if (tface != NULL)
                 gfx_typeface_destroy(tface);
@@ -147 +238 @@
         gfx_color_delete(resource->btn_shadow_color);
 
+        gfx_color_delete(resource->wnd_face_color);
+        gfx_color_delete(resource->wnd_text_color);
+        gfx_color_delete(resource->wnd_frame_hi_color);
+        gfx_color_delete(resource->wnd_frame_sh_color);
+        gfx_color_delete(resource->wnd_highlight_color);
+        gfx_color_delete(resource->wnd_shadow_color);
+
+        gfx_color_delete(resource->tbar_act_bg_color);
+        gfx_color_delete(resource->tbar_act_text_color);
+        gfx_color_delete(resource->tbar_inact_bg_color);
+        gfx_color_delete(resource->tbar_inact_text_color);
+
         gfx_font_close(resource->font);
         gfx_typeface_destroy(resource->tface);

uspace/lib/ui/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(pbutton);
 PCUT_IMPORT(resource);
+PCUT_IMPORT(wdecor);
 
 PCUT_MAIN();