Changeset 8b863a62 in mainline for uspace/lib/gui/canvas.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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.c (modified) (2 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);
 }
 
 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);
 }
 
@@ -142 +151 @@
 }
 
+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)