add xdisplay_mirror

examples/fbmirror.py

@@ -35,21 +35,6 @@
 
 linux_framebuffer = np.memmap('/dev/fb0',mode='r', shape=(screeny, stride // bytes_per_pixel), dtype=dtype)
 
-def make_pixelmap_multilane(width, height, n_addr_lines, n_lanes):
-    calc_height = n_lanes << n_addr_lines
-    if height != calc_height:
-        raise RuntimeError(f"Calculated height {calc_height} does not match requested height {height}")
-    n_addr = 1 << n_addr_lines
-
-    m = []
-    for addr in range(n_addr):
-        for x in range(width):
-            for lane in range(n_lanes):
-                y = addr + lane * n_addr
-                m.append(x + width * y)
-    print(m)
-    return m
-
 @click.command
 @click.option("--x-offset", "xoffset", type=int, help="The x offset of top left corner of the region to mirror",  default=0)
 @click.option("--y-offset", "yoffset", type=int, help="The y offset of top left corner of the region to mirror", default=0)

examples/virtualdisplay.py

@@ -32,6 +32,7 @@
 
 import adafruit_blinka_raspberry_pi5_piomatter as piomatter
 import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click
+from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
 
 
 @click.command
@@ -42,14 +43,21 @@
 @click.option("--use-xauth/--no-use-xauth", help="If a Xauthority file should be created",  default=False)
 @piomatter_click.standard_options
 @click.argument("command", nargs=-1)
-def main(scale, backend, use_xauth, extra_args, rfbport, width, height, serpentine, rotation, pinout, n_planes, n_addr_lines, command):
+def main(scale, backend, use_xauth, extra_args, rfbport, width, height, serpentine, rotation, pinout,
+         n_planes, n_temporal_planes, n_addr_lines, n_lanes, command):
     kwargs = {}
     if backend == "xvnc":
         kwargs['rfbport'] = rfbport
     if extra_args:
         kwargs['extra_args'] = shlex.split(extra_args)
     print("xauth", use_xauth)
-    geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines, rotation=rotation)
+    if n_lanes != 2:
+        pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
+        geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
+                                      n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
+    else:
+        geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
+                                      n_temporal_planes=n_temporal_planes, rotation=rotation)
     framebuffer = np.zeros(shape=(geometry.height, geometry.width, 3), dtype=np.uint8)
     matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=pinout, framebuffer=framebuffer, geometry=geometry)
 

examples/xdisplay_mirror.py

@@ -0,0 +1,68 @@
+#!/usr/bin/python3
+"""
+Display a (possibly scaled) X display to a matrix
+
+The display runs until this script exits.
+
+The display doesn't get a keyboard or mouse, so you have to use a program that
+will get its input in some other way, such as from a gamepad.
+
+For help with commandline arguments, run `python xdisplay_mirror.py --help`
+
+This example command will mirror the entire display scaled onto a 2x2 grid of 64px panels, total matrix size 128x128.
+
+    $ python xdisplay_mirror.py --pinout AdafruitMatrixHatBGR --width 128 --height 128 --serpentine --num-address-lines 5 --num-planes 8
+
+This example command will mirror a 128x128 pixel square from the top left of the display at real size on the same matrix panels
+
+    $  python xdisplay_mirror.py --pinout AdafruitMatrixHatBGR --width 128 --height 128 --serpentine --num-address-lines 5 --num-planes 8 --mirror-region 0,0,128,128
+"""
+
+import click
+import numpy as np
+from PIL import ImageGrab
+
+import adafruit_blinka_raspberry_pi5_piomatter as piomatter
+import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click
+from adafruit_blinka_raspberry_pi5_piomatter.pixelmappers import simple_multilane_mapper
+
+
+@click.command
+@click.option("--mirror-region", help="Region of X display to mirror. Comma seperated x,y,w,h. "
+                                      "Default will mirror entire display.", default="")
+@click.option("--x-display", help="The X display to mirror. Default is :0", default=":0")
+@piomatter_click.standard_options(n_lanes=2, n_temporal_planes=0)
+def main(width, height, serpentine, rotation, pinout, n_planes,
+         n_temporal_planes, n_addr_lines, n_lanes, mirror_region, x_display):
+    if n_lanes != 2:
+        pixelmap = simple_multilane_mapper(width, height, n_addr_lines, n_lanes)
+        geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
+                                      n_temporal_planes=n_temporal_planes, n_lanes=n_lanes, map=pixelmap)
+    else:
+        geometry = piomatter.Geometry(width=width, height=height, n_planes=n_planes, n_addr_lines=n_addr_lines,
+                                      n_temporal_planes=n_temporal_planes, rotation=rotation)
+
+    framebuffer = np.zeros(shape=(geometry.height, geometry.width, 3), dtype=np.uint8)
+    matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=pinout, framebuffer=framebuffer,
+                                 geometry=geometry)
+
+    if mirror_region:
+        mirror_region = tuple(int(_) for _ in mirror_region.split(','))
+    else:
+        mirror_region = None
+        size_measure = ImageGrab.grab(xdisplay=":0")
+        print(f"Mirroring full display: {size_measure.width}, {size_measure.height}")
+
+    while True:
+        img = ImageGrab.grab(xdisplay=x_display)
+        if mirror_region is not None:
+            img = img.crop((mirror_region[0], mirror_region[1],    # left,top
+                            mirror_region[0] + mirror_region[2],   # right
+                            mirror_region[1] + mirror_region[3]))  # bottom
+        img = img.resize((width, height))
+
+        framebuffer[:, :] = np.array(img)
+        matrix.show()
+
+if __name__ == '__main__':
+    main()