Changeset 4fbdc3d in mainline for uspace/srv/hid/display/seat.c

Timestamp:

2019-12-11T16:58:30Z (4 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

File:

• uspace/srv/hid/display/seat.c (modified) (5 diffs)

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;
+}
+
 /** @}
  */