Changeset d17a4a9 in mainline

Timestamp:

2012-08-18T18:37:50Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

dd13349

Parents:

b5416c3

Message:

Implement absolute move events in compositor in a simple way.

File:

• uspace/srv/hid/compositor/compositor.c (modified) (1 diff)

uspace/srv/hid/compositor/compositor.c

@@ -1075 +1075 @@
     unsigned max_x, unsigned max_y)
 {
-        /* XXX TODO */
-        return EOK;
+        /* XXX TODO Use absolute coordinates directly */
+        
+        pointer_t *pointer = input_pointer(input);
+        
+        sysarg_t width, height;
+        
+        fibril_mutex_lock(&viewport_list_mtx);
+        if (list_empty(&viewport_list)) {
+                printf("No viewport found\n");
+                fibril_mutex_unlock(&viewport_list_mtx);
+                return EOK; /* XXX */
+        }
+        link_t *link = list_first(&viewport_list);
+        viewport_t *vp = list_get_instance(link, viewport_t, link);
+        surface_get_resolution(vp->surface, &width, &height);
+        desktop_point_t vp_pos = vp->pos;
+        fibril_mutex_unlock(&viewport_list_mtx);
+
+        desktop_point_t pos_in_viewport;
+        pos_in_viewport.x = x * width / max_x;
+        pos_in_viewport.y = y * height / max_y;
+        
+        /* Calculate offset from pointer */
+        fibril_mutex_lock(&pointer_list_mtx);
+        desktop_vector_t delta;
+        delta.x = (vp_pos.x + pos_in_viewport.x) - pointer->pos.x;
+        delta.y = (vp_pos.y + pos_in_viewport.y) - pointer->pos.y;
+        fibril_mutex_unlock(&pointer_list_mtx);
+        
+        return comp_mouse_move(input, delta.x, delta.y);
 }