Changeset 7e38970d in mainline for uspace/lib/ui/include/ui/entry.h

Timestamp:

2020-12-07T00:08:37Z (3 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/include/ui/entry.h (moved) (moved from uspace/lib/gui/canvas.h ) (2 diffs)

uspace/lib/ui/include/ui/entry.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Martin Decky
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup gui
+/** @addtogroup libui
  * @{
  */
 /**
- * @file
+ * @file Text entry
  */
 
-#ifndef GUI_CANVAS_H_
-#define GUI_CANVAS_H_
+#ifndef _UI_ENTRY_H
+#define _UI_ENTRY_H
 
-#include <stdbool.h>
-#include <io/pixel.h>
-#include <draw/surface.h>
-#include "widget.h"
-#include "connection.h"
+#include <errno.h>
+#include <gfx/coord.h>
+#include <gfx/text.h>
+#include <types/ui/control.h>
+#include <types/ui/entry.h>
+#include <types/ui/resource.h>
 
-typedef struct {
-        widget_t widget;
-        sysarg_t width;
-        sysarg_t height;
-        surface_t *surface;
-        signal_t keyboard_event;
-        signal_t position_event;
-} canvas_t;
-
-extern bool init_canvas(canvas_t *, widget_t *, const void *, sysarg_t,
-    sysarg_t, surface_t *);
-extern canvas_t *create_canvas(widget_t *, const void *, sysarg_t, sysarg_t,
-    surface_t *);
-extern bool update_canvas(canvas_t *, surface_t *);
-extern void deinit_canvas(canvas_t *);
+extern errno_t ui_entry_create(ui_resource_t *, const char *,
+    ui_entry_t **);
+extern void ui_entry_destroy(ui_entry_t *);
+extern ui_control_t *ui_entry_ctl(ui_entry_t *);
+extern void ui_entry_set_rect(ui_entry_t *, gfx_rect_t *);
+extern void ui_entry_set_halign(ui_entry_t *, gfx_halign_t);
+extern errno_t ui_entry_set_text(ui_entry_t *, const char *);
+extern errno_t ui_entry_paint(ui_entry_t *);
 
 #endif