Changeset 1388f7f0 in mainline for uspace/srv

Timestamp:

2020-02-21T10:50:48Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

265989d

Parents:

6c2aba3

git-author:

Jiri Svoboda <jiri@…> (2020-02-19 19:38:03)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-21 10:50:48)

Message:

Support absolute movement events from input device

Location:

uspace/srv/hid/display

Files:

• input.c (modified) (1 diff)
• seat.c (modified) (2 diffs)
• types/display/ptd_event.h (modified) (2 diffs)

uspace/srv/hid/display/input.c

@@ -97 +97 @@
     unsigned max_x, unsigned max_y)
 {
-        printf("ds_input_ev_abs_move x=%u y=%u mx=%u my=%u\n",
-            x, y, max_x, max_y);
-        return EOK;
+        ds_display_t *disp = (ds_display_t *) input->user;
+        ptd_event_t event;
+
+        event.type = PTD_ABS_MOVE;
+        event.apos.x = x;
+        event.apos.y = y;
+        event.abounds.p0.x = 0;
+        event.abounds.p0.y = 0;
+        event.abounds.p1.x = max_x + 1;
+        event.abounds.p1.y = max_y + 1;
+
+        return ds_display_post_ptd_event(disp, &event);
 }
 

uspace/srv/hid/display/seat.c

@@ -256 +256 @@
  * @return EOK on success or an error code
  */
+#include <stdio.h>
 errno_t ds_seat_post_ptd_event(ds_seat_t *seat, ptd_event_t *event)
 {
@@ -306 +307 @@
         }
 
+        if (event->type == PTD_ABS_MOVE) {
+                /*
+                 * Project input device area onto display area. Technically
+                 * we probably want to project onto the area of a particular
+                 * display device. The tricky part is figuring out which
+                 * display device the input device is associated with.
+                 */
+                gfx_coord2_project(&event->apos, &event->abounds,
+                    &disp->rect, &npos);
+
+                gfx_coord2_clip(&npos, &disp->rect, &npos);
+
+                (void) ds_seat_clear_pointer(seat);
+                seat->pntpos = npos;
+
+                pevent.pos_id = 0;
+                pevent.type = POS_UPDATE;
+                pevent.btn_num = 0;
+                pevent.hpos = seat->pntpos.x;
+                pevent.vpos = seat->pntpos.y;
+
+                rc = ds_seat_post_pos_event(seat, &pevent);
+                if (rc != EOK)
+                        return rc;
+
+                (void) ds_seat_draw_pointer(seat);
+        }
+
         return EOK;
 }

uspace/srv/hid/display/types/display/ptd_event.h

@@ -40 +40 @@
 typedef enum {
         PTD_MOVE,
+        PTD_ABS_MOVE,
         PTD_PRESS,
         PTD_RELEASE
@@ -51 +52 @@
         /** Relative move vector for PTD_MOVE */
         gfx_coord2_t dmove;
+        /** Absolute position for PTD_ABS_MOVE */
+        gfx_coord2_t apos;
+        /** Absolute position bounds for PTD_ABS_MOVE */
+        gfx_rect_t abounds;
 } ptd_event_t;