Changeset 6560960 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2012-08-20T22:46:13Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

077dad2

Parents:

971f50e7 (diff), dd13349 (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/srv/hid/compositor/compositor.c (modified) (19 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -92 +92 @@
         sysarg_t id;
         uint8_t state;
-        sysarg_t hpos;
-        sysarg_t vpos;
+        desktop_point_t pos;
         sysarg_t btn_num;
-        sysarg_t btn_hpos;
-        sysarg_t btn_vpos;
-        int accum_dx;
-        int accum_dy;
+        desktop_point_t btn_pos;
+        desktop_vector_t accum;
         sysarg_t grab_flags;
         bool pressed;
@@ -135 +132 @@
         vslmode_t mode;
         async_sess_t *sess;
-        sysarg_t hpos;
-        sysarg_t vpos;
+        desktop_point_t pos;
         surface_t *surface;
 } viewport_t;
@@ -174 +170 @@
 
         link_initialize(&p->link);
-        p->hpos = coord_origin;
-        p->vpos = coord_origin;
+        p->pos.x = coord_origin;
+        p->pos.y = coord_origin;
         p->btn_num = 1;
-        p->btn_hpos = p->hpos;
-        p->btn_vpos = p->vpos;
-        p->accum_dx = 0;
-        p->accum_dy = 0;
+        p->btn_pos = p->pos;
+        p->accum.x = 0;
+        p->accum.y = 0;
         p->grab_flags = GF_EMPTY;
         p->pressed = false;
@@ -307 +302 @@
                 bool isec_vp = rectangle_intersect(
                     x_dmg_glob, y_dmg_glob, w_dmg_glob, h_dmg_glob,
-                    vp->hpos, vp->vpos, w_dmg_vp, h_dmg_vp,
+                    vp->pos.x, vp->pos.y, w_dmg_vp, h_dmg_vp,
                     &x_dmg_vp, &y_dmg_vp, &w_dmg_vp, &h_dmg_vp);
 
@@ -313 +308 @@
 
                         /* Paint background color. */
-                        for (sysarg_t y = y_dmg_vp - vp->vpos; y <  y_dmg_vp - vp->vpos + h_dmg_vp; ++y) {
-                                for (sysarg_t x = x_dmg_vp - vp->hpos; x < x_dmg_vp - vp->hpos + w_dmg_vp; ++x) {
+                        for (sysarg_t y = y_dmg_vp - vp->pos.y; y <  y_dmg_vp - vp->pos.y + h_dmg_vp; ++y) {
+                                for (sysarg_t x = x_dmg_vp - vp->pos.x; x < x_dmg_vp - vp->pos.x + w_dmg_vp; ++x) {
                                         surface_put_pixel(vp->surface, x, y, bg_color);
                                 }
@@ -352 +347 @@
                                          * coordinates. */
                                         transform = win->transform;
-                                        double hpos = vp->hpos;
-                                        double vpos = vp->vpos;
-                                        transform_translate(&transform, -hpos, -vpos);
+                                        double_point_t pos;
+                                        pos.x = vp->pos.x;
+                                        pos.y = vp->pos.y;
+                                        transform_translate(&transform, -pos.x, -pos.y);
 
                                         source_set_transform(&source, transform);                               
@@ -361 +357 @@
 
                                         drawctx_transfer(&context,
-                                            x_dmg_win - vp->hpos, y_dmg_win - vp->vpos, w_dmg_win, h_dmg_win);
+                                            x_dmg_win - vp->pos.x, y_dmg_win - vp->pos.y, w_dmg_win, h_dmg_win);
                                 }
                         }
@@ -375 +371 @@
                                 bool isec_ptr = rectangle_intersect(
                                     x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp,
-                                    ptr->hpos, ptr->vpos, w_dmg_ptr, h_dmg_ptr,
+                                    ptr->pos.x, ptr->pos.y, w_dmg_ptr, h_dmg_ptr,
                                     &x_dmg_ptr, &y_dmg_ptr, &w_dmg_ptr, &h_dmg_ptr);
 
@@ -386 +382 @@
 
                                         pixel_t pix = 0;
-                                        sysarg_t x_vp = x_dmg_ptr - vp->hpos;
-                                        sysarg_t y_vp = y_dmg_ptr - vp->vpos;
-                                        sysarg_t x_ptr = x_dmg_ptr - ptr->hpos;
-                                        sysarg_t y_ptr = y_dmg_ptr - ptr->vpos;
+                                        sysarg_t x_vp = x_dmg_ptr - vp->pos.x;
+                                        sysarg_t y_vp = y_dmg_ptr - vp->pos.y;
+                                        sysarg_t x_ptr = x_dmg_ptr - ptr->pos.x;
+                                        sysarg_t y_ptr = y_dmg_ptr - ptr->pos.y;
 
                                         for (sysarg_t y = 0; y < h_dmg_ptr; ++y) {
@@ -901 +897 @@
 
         link_initialize(&vp->link);
-        vp->hpos = coord_origin;
-        vp->vpos = coord_origin;
+        vp->pos.x = coord_origin;
+        vp->pos.y = coord_origin;
 
         /* Establish output bidirectional connection. */
@@ -1002 +998 @@
         /* window_list_mtx locked by caller */
 
-        int dx = pointer->accum_dx;
-        int dy = pointer->accum_dy;
-        pointer->accum_dx = 0;
-        pointer->accum_dy = 0;
+        int dx = pointer->accum.x;
+        int dy = pointer->accum.y;
+        pointer->accum.x = 0;
+        pointer->accum.y = 0;
 
         bool move = (pointer->grab_flags & GF_MOVE_X) || (pointer->grab_flags & GF_MOVE_Y);
@@ -1079 +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);
 }
 
@@ -1089 +1113 @@
         /* Update pointer position. */
         fibril_mutex_lock(&pointer_list_mtx);
-        sysarg_t old_hpos = pointer->hpos;
-        sysarg_t old_vpos = pointer->vpos;
+        desktop_point_t old_pos = pointer->pos;
         sysarg_t cursor_width;
         sysarg_t cursor_height;
         surface_get_resolution(pointer->cursor.states[pointer->state], 
              &cursor_width, &cursor_height);
-        pointer->hpos += dx;
-        pointer->vpos += dy;
+        pointer->pos.x += dx;
+        pointer->pos.y += dy;
         fibril_mutex_unlock(&pointer_list_mtx);
-        comp_damage(old_hpos, old_vpos, cursor_width, cursor_height);
-        comp_damage(old_hpos + dx, old_vpos + dy, cursor_width, cursor_height);
+        comp_damage(old_pos.x, old_pos.y, cursor_width, cursor_height);
+        comp_damage(old_pos.x + dx, old_pos.y + dy, cursor_width, cursor_height);
 
         fibril_mutex_lock(&window_list_mtx);
@@ -1111 +1134 @@
                         sysarg_t width, height;
                         surface_get_resolution(top->surface, &width, &height);
-                        within_client = comp_coord_to_client(pointer->hpos, pointer->vpos,
+                        within_client = comp_coord_to_client(pointer->pos.x, pointer->pos.y,
                             top->transform, width, height, &point_x, &point_y);
                         fibril_mutex_unlock(&window_list_mtx);
@@ -1130 +1153 @@
                 } else {
                         /* Pointer is grabbed by top-level window action. */
-                        pointer->accum_dx += dx;
-                        pointer->accum_dy += dy;
+                        pointer->accum.x += dx;
+                        pointer->accum.y += dy;
 #if ANIMATE_WINDOW_TRANSFORMS == 1
                         sysarg_t x, y, width, height;
@@ -1153 +1176 @@
 
         if (bpress) {
-                pointer->btn_hpos = pointer->hpos;
-                pointer->btn_vpos = pointer->vpos;
+                pointer->btn_pos = pointer->pos;
                 pointer->btn_num = bnum;
                 pointer->pressed = true;
@@ -1167 +1189 @@
                 sysarg_t x, y, width, height;
                 surface_get_resolution(win->surface, &width, &height);
-                bool within_client = comp_coord_to_client(pointer->hpos, pointer->vpos,
+                bool within_client = comp_coord_to_client(pointer->pos.x, pointer->pos.y,
                     win->transform, width, height, &x, &y);
                 fibril_mutex_unlock(&window_list_mtx);
@@ -1202 +1224 @@
                         if (win->surface) {
                                 surface_get_resolution(win->surface, &width, &height);
-                                within_client = comp_coord_to_client(pointer->hpos, pointer->vpos,
+                                within_client = comp_coord_to_client(pointer->pos.x, pointer->pos.y,
                                     win->transform, width, height, &point_x, &point_y);
                         }
@@ -1518 +1540 @@
                         switch (key) {
                         case KC_I:
-                                vp->hpos += 0;
-                                vp->vpos += -20;
+                                vp->pos.x += 0;
+                                vp->pos.y += -20;
                                 break;
                         case KC_K:
-                                vp->hpos += 0;
-                                vp->vpos += 20;
+                                vp->pos.x += 0;
+                                vp->pos.y += 20;
                                 break;
                         case KC_J:
-                                vp->hpos += -20;
-                                vp->vpos += 0;
+                                vp->pos.x += -20;
+                                vp->pos.y += 0;
                                 break;
                         case KC_L:
-                                vp->hpos += 20;
-                                vp->vpos += 0;
+                                vp->pos.x += 20;
+                                vp->pos.y += 0;
                                 break;
                         default:
-                                vp->hpos += 0;
-                                vp->vpos += 0;
+                                vp->pos.x += 0;
+                                vp->pos.y += 0;
                                 break;
                         }
                         
-                        sysarg_t x = vp->hpos;
-                        sysarg_t y = vp->vpos;
+                        sysarg_t x = vp->pos.x;
+                        sysarg_t y = vp->pos.y;
                         sysarg_t width, height;
                         surface_get_resolution(vp->surface, &width, &height);