Changeset 4fbdc3d in mainline

Timestamp:

2019-12-11T16:58:30Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4d9c807

Parents:

5bded44

Message:

Movement events from input server, display pointer, focus by click again

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (2 diffs)
• display.h (modified) (2 diffs)
• input.c (modified) (3 diffs)
• seat.c (modified) (5 diffs)
• seat.h (modified) (2 diffs)
• test/display.c (modified) (4 diffs)
• types/display/ptd_event.h (added)
• types/display/seat.h (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -267 +267 @@
  * @param event Event
  */
-errno_t ds_display_post_pos_event(ds_display_t *display, pos_event_t *event)
-{
-        gfx_coord2_t pos;
-        ds_window_t *wnd;
+errno_t ds_display_post_ptd_event(ds_display_t *display, ptd_event_t *event)
+{
         ds_seat_t *seat;
 
-        /* Focus window on button press */
-        if (event->type == POS_PRESS) {
-                printf("Button press\n");
-                pos.x = event->hpos;
-                pos.y = event->vpos;
-
-                wnd = ds_display_window_by_pos(display, &pos);
-                if (wnd != NULL) {
-                        seat = ds_display_first_seat(display);
-                        if (seat == NULL)
-                                return EOK;
-
-                        ds_seat_set_focus(seat, wnd);
-                        return EOK;
-                }
-        }
-
-        return EOK;
+        // TODO Determine which seat the event belongs to
+        seat = ds_display_first_seat(display);
+        printf("ds_display_post_ptd_event: seat=%p\n", seat);
+        if (seat == NULL)
+                return EOK;
+
+        return ds_seat_post_ptd_event(seat, event);
 }
 
@@ -408 +395 @@
         ddev = ds_display_first_ddev(display);
         if (ddev == NULL)
-                abort();
+                return NULL;
 
         return ddev->gc;

uspace/srv/hid/display/display.h

@@ -40 +40 @@
 #include <gfx/context.h>
 #include <io/kbd_event.h>
-#include <io/pos_event.h>
 #include "types/display/client.h"
 #include "types/display/ddev.h"
 #include "types/display/display.h"
+#include "types/display/ptd_event.h"
 #include "types/display/seat.h"
 
@@ -59 +59 @@
 extern ds_window_t *ds_display_next_window(ds_window_t *);
 extern errno_t ds_display_post_kbd_event(ds_display_t *, kbd_event_t *);
-extern errno_t ds_display_post_pos_event(ds_display_t *, pos_event_t *);
+extern errno_t ds_display_post_ptd_event(ds_display_t *, ptd_event_t *);
 extern void ds_display_add_seat(ds_display_t *, ds_seat_t *);
 extern void ds_display_remove_seat(ds_seat_t *);

uspace/srv/hid/display/input.c

@@ -85 +85 @@
 static errno_t ds_input_ev_move(input_t *input, int dx, int dy)
 {
-        return EOK;
+        ds_display_t *disp = (ds_display_t *) input->user;
+        ptd_event_t event;
+
+        printf("ds_input_ev_move\n");
+        event.type = PTD_MOVE;
+        event.dmove.x = dx;
+        event.dmove.y = dy;
+
+        return ds_display_post_ptd_event(disp, &event);
 }
 
@@ -91 +99 @@
     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;
 }
@@ -96 +106 @@
 static errno_t ds_input_ev_button(input_t *input, int bnum, int bpress)
 {
-        return EOK;
+        ds_display_t *disp = (ds_display_t *) input->user;
+        ptd_event_t event;
+
+        printf("ds_input_ev_abs_button\n");
+        event.type = bpress ? PTD_PRESS : PTD_RELEASE;
+        event.btn_num = bnum;
+        event.dmove.x = 0;
+        event.dmove.y = 0;
+
+        return ds_display_post_ptd_event(disp, &event);
 }
 

uspace/srv/hid/display/seat.c

@@ -36 +36 @@
 #include <adt/list.h>
 #include <errno.h>
+#include <gfx/color.h>
+#include <gfx/render.h>
 #include <stdlib.h>
 #include "client.h"
@@ -57 +59 @@
 
         ds_display_add_seat(display, seat);
+        seat->pntpos.x = 10;
+        seat->pntpos.y = 10;
 
         *rseat = seat;
@@ -72 +76 @@
 }
 
+/** Set seat focus to a window.
+ *
+ * @param seat Seat
+ * @param wnd Window to focus
+ */
 void ds_seat_set_focus(ds_seat_t *seat, ds_window_t *wnd)
 {
@@ -77 +86 @@
 }
 
+/** Evacuate focus from window.
+ *
+ * If seat's focus is @a wnd, it will be set to a different window.
+ *
+ * @param seat Seat
+ * @param wnd Window to evacuate focus from
+ */
 void ds_seat_evac_focus(ds_seat_t *seat, ds_window_t *wnd)
 {
@@ -119 +135 @@
 }
 
+/** Draw cross at seat pointer position.
+ *
+ * @param seat Seat
+ * @param len Cross length
+ * @param w Cross extra width
+ * @param br Brightness (0 to 65535)
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ds_seat_draw_cross(ds_seat_t *seat, gfx_coord_t len,
+    gfx_coord_t w, uint16_t br)
+{
+        gfx_color_t *color = NULL;
+        gfx_context_t *gc;
+        gfx_rect_t rect, r0;
+        errno_t rc;
+
+        gc = ds_display_get_gc(seat->display);
+        if (gc == NULL)
+                return EOK;
+
+        rc = gfx_color_new_rgb_i16(br, br, br, &color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_set_color(gc, color);
+        if (rc != EOK)
+                goto error;
+
+        r0.p0.x = -len;
+        r0.p0.y = -w;
+        r0.p1.x = +len + 1;
+        r0.p1.y = +w + 1;
+        gfx_rect_translate(&seat->pntpos, &r0, &rect);
+
+        rc = gfx_fill_rect(gc, &rect);
+        if (rc != EOK)
+                goto error;
+
+        r0.p0.x = -w;
+        r0.p0.y = -len;
+        r0.p1.x = +w + 1;
+        r0.p1.y = +len + 1;
+        gfx_rect_translate(&seat->pntpos, &r0, &rect);
+
+        rc = gfx_fill_rect(gc, &rect);
+        if (rc != EOK)
+                goto error;
+
+        gfx_color_delete(color);
+        return EOK;
+error:
+        if (color != NULL)
+                gfx_color_delete(color);
+        return rc;
+}
+
+/** Draw or clear seat pointer
+ *
+ * @param seat Seat
+ * @param shown @c true to display pointer, @c false to clear it
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ds_seat_draw_pointer(ds_seat_t *seat, bool shown)
+{
+        errno_t rc;
+
+        rc = ds_seat_draw_cross(seat, 8, 1, 0);
+        if (rc != EOK)
+                return rc;
+
+        rc = ds_seat_draw_cross(seat, 8, 0, shown ? 65535 : 0);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Post pointing device event to the seat
+ *
+ * @param seat Seat
+ * @param event Event
+ *
+ * @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)
+{
+        ds_window_t *wnd;
+        gfx_coord2_t npos;
+
+        printf("ds_seat_post_ptd_event\n");
+        /* Focus window on button press */
+        if (event->type == PTD_PRESS) {
+                printf("PTD_PRESS\n");
+                wnd = ds_display_window_by_pos(seat->display, &seat->pntpos);
+                if (wnd != NULL) {
+                        printf("set focus\n");
+                        ds_seat_set_focus(seat, wnd);
+                        return EOK;
+                }
+        }
+
+        if (event->type == PTD_MOVE) {
+                printf("PTD_MOVE\n");
+                gfx_coord2_add(&seat->pntpos, &event->dmove, &npos);
+                if (npos.x < 10)
+                        npos.x = 10;
+                if (npos.y < 10)
+                        npos.y = 10;
+                if (npos.x > 1024 - 10)
+                        npos.x = 1024 - 10;
+                if (npos.y > 768 - 10)
+                        npos.y = 768 - 10;
+
+                printf("clear pointer\n");
+                (void) ds_seat_draw_pointer(seat, false);
+                seat->pntpos = npos;
+                printf("draw pointer\n");
+                (void) ds_seat_draw_pointer(seat, true);
+        }
+
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/hid/display/seat.h

@@ -41 +41 @@
 #include "types/display/display.h"
 #include "types/display/seat.h"
+#include "types/display/ptd_event.h"
 #include "types/display/window.h"
 
@@ -48 +49 @@
 extern void ds_seat_evac_focus(ds_seat_t *, ds_window_t *);
 extern errno_t ds_seat_post_kbd_event(ds_seat_t *, kbd_event_t *);
+extern errno_t ds_seat_post_ptd_event(ds_seat_t *, ptd_event_t *);
 
 #endif

uspace/srv/hid/display/test/display.c

@@ -309 +309 @@
 }
 
-/** Test ds_display_post_pos_event() with click on window switches focus
+/** Test ds_display_post_ptd_event() with click on window switches focus
  */
-PCUT_TEST(display_post_pos_event_wnd_switch)
+PCUT_TEST(display_post_ptd_event_wnd_switch)
 {
         ds_display_t *disp;
@@ -317 +317 @@
         ds_client_t *client;
         ds_window_t *w0, *w1;
-        pos_event_t event;
+        ptd_event_t event;
         bool called_cb = false;
         errno_t rc;
@@ -342 +342 @@
         w1->dpos.y = 400;
 
+        PCUT_ASSERT_FALSE(called_cb);
+
         ds_seat_set_focus(seat, w0);
 
-        event.type = POS_PRESS;
+        event.type = PTD_MOVE;
+        event.dmove.x = 400;
+        event.dmove.y = 400;
+        rc = ds_display_post_ptd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(called_cb);
+
+        event.type = PTD_PRESS;
         event.btn_num = 1;
-
-        PCUT_ASSERT_FALSE(called_cb);
-
-        event.hpos = 400;
-        event.vpos = 400;
-        rc = ds_display_post_pos_event(disp, &event);
+        rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_FALSE(called_cb);
@@ -357 +361 @@
         PCUT_ASSERT_EQUALS(w1, seat->focus);
 
-        event.hpos = 10;
-        event.vpos = 10;
-        rc = ds_display_post_pos_event(disp, &event);
+        event.type = PTD_MOVE;
+        event.dmove.x = -400;
+        event.dmove.y = -400;
+        rc = ds_display_post_ptd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(called_cb);
+
+        event.type = PTD_PRESS;
+        event.btn_num = 1;
+        rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_FALSE(called_cb);

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

@@ -38 +38 @@
 
 #include <adt/list.h>
+#include <gfx/coord.h>
 
 /** Display server seat */
@@ -47 +48 @@
         /** Window this seat is focused on */
         struct ds_window *focus;
+        /** Pointer position */
+        gfx_coord2_t pntpos;
 } ds_seat_t;