Changes in uspace/lib/gui/canvas.c [e31ea20d:10cb47e] in mainline

File:

• uspace/lib/gui/canvas.c (modified) (4 diffs)

uspace/lib/gui/canvas.c

@@ -58 +58 @@
         source_init(&source);
         source_set_transform(&source, transform);
-        source_set_texture(&source, canvas->surface, false);
+        source_set_texture(&source, canvas->surface,
+            PIXELMAP_EXTEND_TRANSPARENT_BLACK);
         
         drawctx_t drawctx;
@@ -105 +106 @@
 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);
 }
 
 static void canvas_handle_position_event(widget_t *widget, pos_event_t event)
 {
-        /* No-op */
+        canvas_t *canvas = (canvas_t *) widget;
+        pos_event_t tevent;
+        
+        tevent = event;
+        tevent.hpos -= widget->hpos;
+        tevent.vpos -= widget->vpos;
+        
+        sig_send(&canvas->position_event, &tevent);
 }
 
-bool init_canvas(canvas_t *canvas, widget_t *parent, sysarg_t width,
-    sysarg_t height, surface_t *surface)
+bool init_canvas(canvas_t *canvas, widget_t *parent, const void *data,
+    sysarg_t width, sysarg_t height, surface_t *surface)
 {
-        widget_init(&canvas->widget, parent);
+        widget_init(&canvas->widget, parent, data);
         
         canvas->widget.width = width;
@@ -142 +152 @@
 }
 
-canvas_t *create_canvas(widget_t *parent, sysarg_t width, sysarg_t height,
-    surface_t *surface)
+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, const void *data, sysarg_t width,
+    sysarg_t height, surface_t *surface)
 {
         canvas_t *canvas = (canvas_t *) malloc(sizeof(canvas_t));
@@ -149 +168 @@
                 return NULL;
         
-        if (init_canvas(canvas, parent, width, height, surface))
+        if (init_canvas(canvas, parent, data, width, height, surface))
                 return canvas;