Changeset 3deb0155 in mainline for uspace/lib/gui/canvas.h

Timestamp:

2013-04-10T19:11:45Z (11 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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 mainline changes

File:

• uspace/lib/gui/canvas.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (2 diffs)

uspace/lib/gui/canvas.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2013 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup gui
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef KERN_LOGO_196X66_H_
-#define KERN_LOGO_196X66_H_
+#ifndef GUI_CANVAS_H_
+#define GUI_CANVAS_H_
 
-#define LOGO_WIDTH   196
-#define LOGO_HEIGHT  66
-#define LOGO_COLOR   0xffffff
+#include <stdbool.h>
+#include <sys/types.h>
+#include <io/pixel.h>
+#include <surface.h>
+#include "widget.h"
 
-#include <typedefs.h>
+typedef struct {
+        widget_t widget;
+        sysarg_t width;
+        sysarg_t height;
+        surface_t *surface;
+} canvas_t;
 
-extern uint32_t fb_logo[LOGO_WIDTH * LOGO_HEIGHT];
+extern bool init_canvas(canvas_t *, widget_t *, sysarg_t, sysarg_t,
+    surface_t *);
+extern canvas_t *create_canvas(widget_t *, sysarg_t, sysarg_t, surface_t *);
+extern void deinit_canvas(canvas_t *);
 
 #endif