Changeset 7e38970d in mainline for uspace/lib/ui/private/window.h

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/ui/private/window.h (moved) (moved from uspace/lib/draw/include/draw/drawctx.h ) (2 diffs)

uspace/lib/ui/private/window.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libui
  * @{
  */
 /**
- * @file
+ * @file Window structure
+ *
  */
 
-#ifndef DRAW_DRAWCTX_H_
-#define DRAW_DRAWCTX_H_
+#ifndef _UI_PRIVATE_WINDOW_H
+#define _UI_PRIVATE_WINDOW_H
 
-#include <stdbool.h>
+#include <errno.h>
+#include <display.h>
+#include <gfx/context.h>
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
 
-#include <compose.h>
-
-#include "surface.h"
-#include "source.h"
-#include "path.h"
-#include "font.h"
-
-struct drawctx {
-        link_t link;
-        list_t list;
-
-        surface_t *surface;
-        compose_t compose;
-        surface_t *mask;
-        source_t *source;
-        font_t *font;
-
-        bool shall_clip;
-        sysarg_t clip_x;
-        sysarg_t clip_y;
-        sysarg_t clip_width;
-        sysarg_t clip_height;
+/** Actual structure of window.
+ *
+ * This is private to libui.
+ */
+struct ui_window {
+        /** Containing user interface */
+        struct ui *ui;
+        /** Callbacks */
+        struct ui_window_cb *cb;
+        /** Callback argument */
+        void *arg;
+        /** Display window */
+        display_window_t *dwindow;
+        /** Window GC */
+        gfx_context_t *gc;
+        /** Window rectangle */
+        gfx_rect_t rect;
+        /** Application area bitmap */
+        gfx_bitmap_t *app_bmp;
+        /** Application area GC */
+        gfx_context_t *app_gc;
+        /** UI resource. Ideally this would be in ui_t. */
+        struct ui_resource *res;
+        /** Window decoration */
+        struct ui_wdecor *wdecor;
+        /** Top-level control in the application area */
+        struct ui_control *control;
+        /** Current cursor */
+        ui_stock_cursor_t cursor;
 };
 
-extern void drawctx_init(drawctx_t *, surface_t *);
-
-extern void drawctx_save(drawctx_t *);
-extern void drawctx_restore(drawctx_t *);
-
-extern void drawctx_set_compose(drawctx_t *, compose_t);
-extern void drawctx_set_clip(drawctx_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
-extern void drawctx_set_mask(drawctx_t *, surface_t *);
-extern void drawctx_set_source(drawctx_t *, source_t *);
-extern void drawctx_set_font(drawctx_t *, font_t *);
-
-extern void drawctx_transfer(drawctx_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
-extern void drawctx_stroke(drawctx_t *, path_t *);
-extern void drawctx_fill(drawctx_t *, path_t *);
-extern void drawctx_print(drawctx_t *, const char *, sysarg_t, sysarg_t);
+extern void ui_window_send_close(ui_window_t *);
+extern void ui_window_send_focus(ui_window_t *);
+extern void ui_window_send_kbd(ui_window_t *, kbd_event_t *);
+extern errno_t ui_window_send_paint(ui_window_t *);
+extern void ui_window_send_pos(ui_window_t *, pos_event_t *);
+extern void ui_window_send_unfocus(ui_window_t *);
 
 #endif