Changeset e1f2079 in mainline for uspace/srv/hid/display

Timestamp:

2020-02-14T19:54:40Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b0a94854

Parents:

b252e87

Message:

Get display resolution by querying display device

Location:

uspace/srv/hid/display

Files:

• ddev.c (modified) (4 diffs)
• display.c (modified) (2 diffs)
• seat.c (modified) (2 diffs)
• types/display/ddev.h (modified) (1 diff)
• types/display/display.h (modified) (2 diffs)

uspace/srv/hid/display/ddev.c

@@ -37 +37 @@
 #include <ddev.h>
 #include <errno.h>
+#include <io/log.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53 +54 @@
 {
         ds_ddev_t *ddev;
+        ddev_info_t info;
         gfx_context_t *gc;
         ddev_t *dd = NULL;
@@ -71 +73 @@
                 return rc;
         }
+
+        rc = ddev_get_info(dd, &info);
+        if (rc != EOK) {
+                printf("Error getting information for display device '%s'.\n",
+                    name);
+                free(name);
+                ddev_close(dd);
+                return rc;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Device rectangle for '%s': "
+            "%d,%d,%d,%d\n", name, info.rect.p0.x, info.rect.p0.y,
+            info.rect.p1.x, info.rect.p1.y);
 
         rc = ddev_get_gc(dd, &gc);
@@ -91 +106 @@
         ddev->dd = dd;
         ddev->gc = gc;
+        ddev->info = info;
 
         ds_display_add_ddev(display, ddev);

uspace/srv/hid/display/display.c

@@ -384 +384 @@
         assert(!link_used(&ddev->lddevs));
 
+        /* Set display dimensions to dimensions of first display device */
+        if (gfx_rect_is_empty(&disp->rect))
+                disp->rect = ddev->info.rect;
+
         ddev->display = disp;
         list_append(&ddev->lddevs, &disp->ddevs);
@@ -447 +451 @@
 errno_t ds_display_paint_bg(ds_display_t *disp, gfx_rect_t *rect)
 {
-        gfx_rect_t dsrect;
         gfx_rect_t crect;
         gfx_context_t *gc;
         errno_t rc;
 
-        dsrect.p0.x = 0;
-        dsrect.p0.y = 0;
-        dsrect.p1.x = 1024;
-        dsrect.p1.y = 768;
-
         if (rect != NULL)
-                gfx_rect_clip(&dsrect, rect, &crect);
+                gfx_rect_clip(&disp->rect, rect, &crect);
         else
-                crect = dsrect;
+                crect = disp->rect;
 
         gc = ds_display_get_gc(disp); // XXX

uspace/srv/hid/display/seat.c

@@ -253 +253 @@
 errno_t ds_seat_post_ptd_event(ds_seat_t *seat, ptd_event_t *event)
 {
+        ds_display_t *disp = seat->display;
         gfx_coord2_t npos;
         ds_window_t *wnd;
@@ -287 +288 @@
 
                 gfx_coord2_add(&seat->pntpos, &event->dmove, &npos);
-                if (npos.x < 0)
-                        npos.x = 0;
-                if (npos.y < 0)
-                        npos.y = 0;
-                if (npos.x > 1024)
-                        npos.x = 1024;
-                if (npos.y > 768)
-                        npos.y = 768;
+                gfx_coord2_clip(&npos, &disp->rect, &npos);
 
                 printf("clear pointer\n");

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

@@ -52 +52 @@
         /** Device GC */
         gfx_context_t *gc;
+        /** Display device information */
+        ddev_info_t info;
         /** Service ID */
         service_id_t svc_id;

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

@@ -39 +39 @@
 #include <adt/list.h>
 #include <gfx/color.h>
+#include <gfx/coord.h>
 #include <io/input.h>
 #include "window.h"
@@ -69 +70 @@
         /** Background color */
         gfx_color_t *bg_color;
+
+        /** Bounding rectangle */
+        gfx_rect_t rect;
 } ds_display_t;