Changeset fa01c05 in mainline for uspace/lib/ui/src/window.c

Timestamp:

2020-11-03T18:46:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b71c0fc

Parents:

4ac11ff

Message:

UI window should fill the application are background

Except for applications that want to do their own drawing without the
use of UI control hierarchy. We solve this by doing it in a default
paint callback that the application can override with its own
paint routine.

File:

• uspace/lib/ui/src/window.c (modified) (15 diffs)

uspace/lib/ui/src/window.c

@@ -37 +37 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <gfx/render.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
@@ -45 +46 @@
 #include <ui/window.h>
 #include "../private/dummygc.h"
+#include "../private/resource.h"
 #include "../private/ui.h"
 #include "../private/wdecor.h"
@@ -205 +207 @@
 }
 
+errno_t ui_window_paint(ui_window_t *window)
+{
+        return ui_window_send_paint(window);
+}
+
 /** Handle window close event. */
 static void dwnd_close_event(void *arg)
@@ -210 +217 @@
         ui_window_t *window = (ui_window_t *) arg;
 
-        ui_window_close(window);
+        ui_window_send_close(window);
 }
 
@@ -223 +230 @@
         }
 
-        ui_window_focus(window);
+        ui_window_send_focus(window);
 }
 
@@ -232 +239 @@
 
         (void) window;
-        ui_window_kbd(window, kbd_event);
+        ui_window_send_kbd(window, kbd_event);
 }
 
@@ -245 +252 @@
 
         ui_wdecor_pos_event(window->wdecor, event);
-        ui_window_pos(window, event);
+        ui_window_send_pos(window, event);
 }
 
@@ -258 +265 @@
         }
 
-        ui_window_unfocus(window);
+        ui_window_send_unfocus(window);
 }
 
@@ -270 +277 @@
         ui_window_t *window = (ui_window_t *) arg;
 
-        ui_window_close(window);
+        ui_window_send_close(window);
 }
 
@@ -290 +297 @@
  * @param window Window
  */
-void ui_window_close(ui_window_t *window)
+void ui_window_send_close(ui_window_t *window)
 {
         if (window->cb != NULL && window->cb->close != NULL)
@@ -300 +307 @@
  * @param window Window
  */
-void ui_window_focus(ui_window_t *window)
+void ui_window_send_focus(ui_window_t *window)
 {
         if (window->cb != NULL && window->cb->focus != NULL)
@@ -310 +317 @@
  * @param window Window
  */
-void ui_window_kbd(ui_window_t *window, kbd_event_t *kbd)
+void ui_window_send_kbd(ui_window_t *window, kbd_event_t *kbd)
 {
         if (window->cb != NULL && window->cb->kbd != NULL)
@@ -316 +323 @@
 }
 
+/** Send window paint event.
+ *
+ * @param window Window
+ */
+errno_t ui_window_send_paint(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->paint != NULL)
+                return window->cb->paint(window, window->arg);
+        else
+                return ui_window_def_paint(window);
+}
+
 /** Send window position event.
  *
  * @param window Window
  */
-void ui_window_pos(ui_window_t *window, pos_event_t *pos)
+void ui_window_send_pos(ui_window_t *window, pos_event_t *pos)
 {
         if (window->cb != NULL && window->cb->pos != NULL)
@@ -330 +349 @@
  * @param window Window
  */
-void ui_window_unfocus(ui_window_t *window)
+void ui_window_send_unfocus(ui_window_t *window)
 {
         if (window->cb != NULL && window->cb->unfocus != NULL)
@@ -336 +355 @@
 }
 
+/** Default window paint routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_def_paint(ui_window_t *window)
+{
+        gfx_rect_t app_rect;
+        errno_t rc;
+
+        rc = gfx_set_color(window->gc, window->res->wnd_face_color);
+        if (rc != EOK)
+                return rc;
+
+        ui_window_get_app_rect(window, &app_rect);
+
+        rc = gfx_fill_rect(window->gc, &app_rect);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** @}
  */