Changeset 22faaf2 in mainline

Timestamp:

2019-10-29T02:34:14Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3c185b6

Parents:

587b4cb

Message:

A little bit of tiling support

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (1 diff)
• output.c (modified) (1 diff)
• types/display/window.h (modified) (2 diffs)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -65 +65 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() -> EOK, id=%zu",
             wnd->id);
+
+        wnd->dpos.x = ((wnd->id - 1) & 1) * 400;
+        wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300;
+
         *rwnd_id = wnd->id;
         return EOK;

uspace/srv/hid/display/output.c

@@ -61 +61 @@
         }
 
-        vw = 400;
-        vh = 300;
+        vw = 800;
+        vh = 600;
 
         pixbuf = calloc(vw * vh, sizeof(pixel_t));

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

@@ -39 +39 @@
 #include <adt/list.h>
 #include <gfx/context.h>
+#include <gfx/coord.h>
 
 typedef sysarg_t ds_wnd_id_t;
@@ -48 +49 @@
         /** Link to @c display->windows */
         link_t lwindows;
+        /** Display position */
+        gfx_coord2_t dpos;
         /** Window ID */
         ds_wnd_id_t id;

uspace/srv/hid/display/window.c

@@ -90 +90 @@
 {
         ds_window_t *wnd = (ds_window_t *) arg;
+        gfx_rect_t drect;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect");
-        return gfx_fill_rect(wnd->display->gc, rect);
+        gfx_rect_translate(&wnd->dpos, rect, &drect);
+        return gfx_fill_rect(wnd->display->gc, &drect);
 }
 
@@ -152 +154 @@
 {
         ds_window_bitmap_t *cbm = (ds_window_bitmap_t *)bm;
-
-        return gfx_bitmap_render(cbm->bitmap, srect0, offs0);
+        gfx_coord2_t doffs;
+
+        if (offs0 != NULL)
+                gfx_coord2_add(&cbm->wnd->dpos, offs0, &doffs);
+        else
+                doffs = cbm->wnd->dpos;
+
+        return gfx_bitmap_render(cbm->bitmap, srect0, &doffs);
 }