Changeset d65be39 in mainline

Timestamp:

2013-10-04T22:56:01Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3e896e1

Parents:

fa24efa

Message:

canvas widget: add support for surface update and keyboard event pass-through

Location:

uspace/lib/gui

Files:

• canvas.c (modified) (2 diffs)
• canvas.h (modified) (3 diffs)

uspace/lib/gui/canvas.c

@@ -105 +105 @@
 static void canvas_handle_keyboard_event(widget_t *widget, kbd_event_t event)
 {
-        /* No-op */
+        canvas_t *canvas = (canvas_t *) widget;
+        
+        sig_send(&canvas->keyboard_event, &event);
 }
 
@@ -142 +144 @@
 }
 
+bool update_canvas(canvas_t *canvas, surface_t *surface)
+{
+        if (surface != NULL)
+                canvas->surface = surface;
+        
+        canvas_repaint(&canvas->widget);
+        return true;
+}
+
 canvas_t *create_canvas(widget_t *parent, sysarg_t width, sysarg_t height,
     surface_t *surface)

uspace/lib/gui/canvas.h

@@ -42 +42 @@
 #include <surface.h>
 #include "widget.h"
+#include "connection.h"
 
 typedef struct {
@@ -48 +49 @@
         sysarg_t height;
         surface_t *surface;
+        signal_t keyboard_event;
 } canvas_t;
 
@@ -53 +55 @@
     surface_t *);
 extern canvas_t *create_canvas(widget_t *, sysarg_t, sysarg_t, surface_t *);
+extern bool update_canvas(canvas_t *, surface_t *);
 extern void deinit_canvas(canvas_t *);