Changeset 4645b2c in mainline for uspace/lib/gui/window.h

Timestamp:

2020-01-29T15:36:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3275736

Parents:

f5191b4

git-author:

Jiri Svoboda <jiri@…> (2020-01-28 19:36:08)

git-committer:

Jiri Svoboda <jiri@…> (2020-01-29 15:36:37)

Message:

Start porting libgui over to libdisplay/libgfx

File:

• uspace/lib/gui/window.h (modified) (4 diffs)

uspace/lib/gui/window.h

@@ -37 +37 @@
 #define GUI_WINDOW_H_
 
-#include <async.h>
 #include <adt/prodcons.h>
 #include <fibril_synch.h>
@@ -43 +42 @@
 #include <io/window.h>
 #include <draw/surface.h>
+#include <display.h>
+#include <gfx/bitmap.h>
+#include <gfx/context.h>
 
 #include "widget.h"
@@ -51 +53 @@
         bool is_focused; /**< True for the top level window of the desktop. */
         char *caption; /**< Text title of the window header. */
-        async_sess_t *isess; /**< Input events from compositor. */
-        async_sess_t *osess; /**< Mainly for damage reporting to compositor. */
+        display_t *display; /**< Display service */
+        display_window_t *dwindow; /**< Display window */
+        gfx_context_t *gc; /**< GC of the window */
         prodcons_t events; /**< Queue for window event loop. */
         widget_t root; /**< Decoration widget serving as a root of widget hiearchy. */
@@ -59 +62 @@
         fibril_mutex_t guard; /**< Mutex guarding window surface. */
         surface_t *surface; /**< Window surface shared with compositor. */
+        gfx_bitmap_t *bitmap; /**< Window bitmap */
 };