aioxlib 0.3.0__tar.gz → 0.4.0__tar.gz

{aioxlib-0.3.0 → aioxlib-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioxlib
-Version: 0.3.0
+Version: 0.4.0
 Summary: Human friendly interface to XLib subsystems using asyncio python
 Author-email: Jose Tiago Macara Coutinho <coutinhotiago@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -52,6 +52,7 @@ The **root package** exposes the functional API and `get_display` only:
 import asyncio
 import aioxlib
 
+
 async def main():
     wnd = await aioxlib.create_window(640, 480, title="Hello from aioxlib")
     await wnd.show()
@@ -60,6 +61,7 @@ async def main():
         if wnd.is_delete_window(event):
             break
 
+
 asyncio.run(main())
 ```
 
@@ -69,6 +71,7 @@ asyncio.run(main())
 import asyncio
 import aioxlib
 
+
 async def main():
     display = await aioxlib.get_display()
     async with display:
@@ -80,6 +83,7 @@ async def main():
             if wnd.is_delete_window(event):
                 break
 
+
 asyncio.run(main())
 ```
 
@@ -134,5 +138,5 @@ GPLv3 or later — see [LICENSE](LICENSE).
 
 ## Author
 
-José Tiago Macara Coutinho  
+José Tiago Macara Coutinho
 <https://codeberg.org/tiagocoutinho>

{aioxlib-0.3.0 → aioxlib-0.4.0}/README.md

@@ -28,6 +28,7 @@ The **root package** exposes the functional API and `get_display` only:
 import asyncio
 import aioxlib
 
+
 async def main():
     wnd = await aioxlib.create_window(640, 480, title="Hello from aioxlib")
     await wnd.show()
@@ -36,6 +37,7 @@ async def main():
         if wnd.is_delete_window(event):
             break
 
+
 asyncio.run(main())
 ```
 
@@ -45,6 +47,7 @@ asyncio.run(main())
 import asyncio
 import aioxlib
 
+
 async def main():
     display = await aioxlib.get_display()
     async with display:
@@ -56,6 +59,7 @@ async def main():
             if wnd.is_delete_window(event):
                 break
 
+
 asyncio.run(main())
 ```
 
@@ -110,5 +114,5 @@ GPLv3 or later — see [LICENSE](LICENSE).
 
 ## Author
 
-José Tiago Macara Coutinho  
+José Tiago Macara Coutinho
 <https://codeberg.org/tiagocoutinho>

{aioxlib-0.3.0 → aioxlib-0.4.0}/aioxlib/__init__.py

@@ -16,7 +16,7 @@ Types and protocol helpers live in submodules::
     from aioxlib.protocol import pack_create_window
 """
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 from .api import *  # noqa: F403
 from .api import __all__ as _api_all

{aioxlib-0.3.0 → aioxlib-0.4.0}/aioxlib/display.py

@@ -772,7 +772,7 @@ class Display:
 
     async def poly_fill_rectangles(self, drawable, gc, rectangles):
         """Poly fill rectangles."""
-        if isinstance(rectangles, (bytes, bytearray)):
+        if isinstance(rectangles, bytes | bytearray):
             payload = pack_poly_fill_raw_rectangles(drawable, gc, rectangles)
         else:
             payload = pack_poly_fill_rectangles(drawable, gc, rectangles)
@@ -784,7 +784,7 @@ class Display:
         *arcs* is a sequence of ``(x, y, width, height, angle1, angle2)``
         with angles in 1/64 degree units, or a pre-packed ``bytes`` LISTofARC.
         """
-        if isinstance(arcs, (bytes, bytearray)):
+        if isinstance(arcs, bytes | bytearray):
             payload = pack_poly_fill_raw_arcs(drawable, gc, arcs)
         else:
             payload = pack_poly_fill_arcs(drawable, gc, arcs)
@@ -871,42 +871,57 @@ class Display:
                     break
         return error
 
+    async def _handle_buffer(self, buffer, current_decoder=None):
+        packet_type = buffer[0]
+        if packet_type == Status.Success:
+            if current_decoder is None:
+                current_decoder = await self.requests.get()
+            decode, future = current_decoder
+            if decode == unpack_setup:
+                size = 8 + 4 * int.from_bytes(buffer[6:8], BYTE_ORDER_TEXT)
+            else:
+                size = 32 + 4 * int.from_bytes(buffer[4:8], BYTE_ORDER_TEXT)
+            if len(buffer) < size:
+                return True, buffer, current_decoder
+            try:
+                reply, offset = decode(buffer, 0)
+                future.set_result(reply)
+            except Exception as error:
+                future.set_exception(error)
+            return False, buffer[offset:], None
+        elif packet_type == Status.Failed and not self.requests.empty():
+            decode, future = await self.requests.get()
+            if decode == unpack_setup:
+                # todo: check if buffer is complete
+                error, offset = unpack_setup_error(buffer)
+                future.set_exception(RuntimeError(error))
+            else:
+                if len(buffer) < 32:
+                    return True, buffer, current_decoder
+                error, offset = unpack_error(buffer)
+                error = self._handle_error(error)
+                log.warning("ERROR: %s", error)
+                future.set_exception(X11Error(error))
+            return False, buffer[offset:], None
+
+        # An event
+        if len(buffer) < 32:
+            return True, buffer, current_decoder
+        event, offset = unpack_event(self._events, buffer)
+        for listener in self.listeners:
+            await listener.put(event)
+        return False, buffer[offset:], current_decoder
+
     async def _loop(self):
-        buffer, decoder = b"", None
+        buffer, context = b"", None
         while True:
-            if not (data := await self.read(4 * 1024)):
+            if not (data := await self.read(4096)):
                 log.info("Connection closed")
                 return
             buffer += data
-            packet_type = buffer[0]
-            if packet_type == Status.Success:
-                if decoder is None:
-                    decoder = await self.requests.get()
-                decode, future = decoder
-                if decode == unpack_setup:
-                    size = 8 + 4 * int.from_bytes(buffer[6:8], BYTE_ORDER_TEXT)
-                else:
-                    size = 32 + 4 * int.from_bytes(buffer[4:8], BYTE_ORDER_TEXT)
-                if len(buffer) < size:
-                    continue
-                reply, offset = decode(buffer, 0)
-                future.set_result(reply)
-                decoder = None
-            elif packet_type == Status.Failed and not self.requests.empty():
-                decode, future = await self.requests.get()
-                if decode == unpack_setup:
-                    error, offset = unpack_setup_error(buffer)
-                    future.set_exception(RuntimeError(error))
-                else:
-                    error, offset = unpack_error(buffer)
-                    error = self._handle_error(error)
-                    log.warning("ERROR: %s", error)
-                    future.set_exception(X11Error(error))
-            else:
-                event, offset = unpack_event(self._events, buffer)
-                for listener in self.listeners:
-                    await listener.put(event)
-            buffer = buffer[offset:]
+            need_more = False
+            while not need_more and buffer:
+                need_more, buffer, context = await self._handle_buffer(buffer, context)
 
     async def events(self):
         """Async iterator yielding event dicts from the server."""
@@ -933,7 +948,7 @@ def get_display_config(uri: str) -> dict:
         display["protocol"] = protocol
     display["port"] = int(display["port"])
     display["uri"] = uri
-    display["screen"] = display["screen"] or 0
+    display["screen"] = int(display["screen"] or 0)
     return display
 
 

{aioxlib-0.3.0 → aioxlib-0.4.0}/aioxlib/glx.py

@@ -613,7 +613,7 @@ def pack_glx_is_direct(opcode, context):
 def unpack_glx_is_direct(data, offset=0):
     """Unpack a glx is direct reply or event from *data* starting at *offset*."""
     result, offset = unpack_reply_head(data, offset)
-    result["is_direct"] = bool(result["n"])
+    result["is_direct"] = bool(struct.unpack_from("B", data, offset)[0])
     offset += 24
     return result, offset
 
@@ -754,17 +754,22 @@ def pack_glx_get_fb_configs(opcode, screen):
 
 def unpack_glx_get_fb_configs(data, offset=0):
     """Unpack a glx get fb configs reply or event from *data* starting at *offset*."""
+    start = offset
     result, offset = unpack_reply_head(data, offset)
+    # Fixed fields at bytes 8..31 of the reply
     n_cfgs, n_props = struct.unpack_from("II", data, offset)
-    offset += 8 + 16
+    offset += struct.calcsize("II") + 16
     total = n_cfgs * n_props
-    props = list(struct.unpack_from(f"{total}I".format(total=total), data, offset)) if total else []
-    offset += total * 4
+    if total:
+        props = list(struct.unpack_from(f"{total}I", data, offset))
+    else:
+        props = []
     configs = [props[i * n_props : (i + 1) * n_props] for i in range(n_cfgs)]
     result["num_fb_configs"] = n_cfgs
     result["num_properties"] = n_props
     result["fb_configs"] = configs
-    return result, offset
+    # Always consume the full reply so the connection buffer stays aligned
+    return result, start + 32 + 4 * result["length"]
 
 
 def pack_glx_create_new_context(
@@ -793,32 +798,51 @@ def pack_glx_create_new_context(
 
 
 def pack_glx_make_context_current(opcode, drawable, read_drawable, context, old_context_tag=0):
-    """Pack a wire-protocol glx make context current request into ``bytes``."""
+    """Pack a wire-protocol glx make context current request into ``bytes``.
+
+    Wire order (glxproto.h)::
+
+        oldContextTag, drawable, readdrawable, context
+    """
     return struct.pack(
         "BBHIIII",
         opcode,
         GLXCommand.MakeContextCurrent,
         5,
+        int(old_context_tag),
         int(drawable),
         int(read_drawable),
         int(context),
-        int(old_context_tag),
     )
 
 
-def pack_glx_create_pbuffer(opcode, pbuffer, fbconfig, attrs: list[tuple[int, int]] | None = None):
-    """Pack a wire-protocol glx create pbuffer request into ``bytes``."""
+def pack_glx_create_pbuffer(
+    opcode,
+    pbuffer,
+    fbconfig,
+    screen=0,
+    attrs: list[tuple[int, int]] | None = None,
+):
+    """Pack a wire-protocol glx create pbuffer request into ``bytes``.
+
+    Wire order (xcb)::
+
+        screen, fbconfig, pbuffer, num_attribs, attribs[num_attribs*2]
+
+    Fixed header ``BBHIIII`` is 5 units plus 2 per attribute pair.
+    """
     attrs = attrs or []
     n = len(attrs)
-    length = 3 + 2 * n
+    length = 5 + 2 * n
     parts = [
         struct.pack(
-            "BBHIII",
+            "BBHIIII",
             opcode,
             GLXCommand.CreatePbuffer,
             length,
-            int(pbuffer),
+            int(screen),
             int(fbconfig),
+            int(pbuffer),
             n,
         )
     ]
@@ -832,20 +856,36 @@ def pack_glx_destroy_pbuffer(opcode, pbuffer):
     return struct.pack("BBHI", opcode, GLXCommand.DestroyPbuffer, 2, int(pbuffer))
 
 
-def pack_glx_create_window(opcode, window, fbconfig, x_window, attrs: list[tuple[int, int]] | None = None):
-    """Pack a wire-protocol glx create window request into ``bytes``."""
+def pack_glx_create_window(
+    opcode,
+    glx_window,
+    fbconfig,
+    x_window,
+    screen=0,
+    attrs: list[tuple[int, int]] | None = None,
+):
+    """Pack a wire-protocol glx create window request into ``bytes``.
+
+    Wire order (GLX 1.3 / xcb)::
+
+        screen, fbconfig, x_window, glx_window, num_attribs, attribs[num_attribs*2]
+
+    Request length is in 4-byte units: fixed header ``BBHIIIII`` is 6 units
+    plus 2 units per attribute/value pair.
+    """
     attrs = attrs or []
     n = len(attrs)
-    length = 4 + 2 * n
+    length = 6 + 2 * n
     parts = [
         struct.pack(
-            "BBHIIII",
+            "=BBHIIIII",
             opcode,
             GLXCommand.CreateWindow,
             length,
-            int(window),
+            int(screen),
             int(fbconfig),
             int(x_window),
+            int(glx_window),
             n,
         )
     ]
@@ -1395,22 +1435,56 @@ class GLX(Extension):
         )
         return context
 
-    async def create_window(self, fbconfig, x_window, attrs=None, window=None):
-        """Create window."""
+    async def create_window(self, fbconfig, x_window, screen=None, attrs=None, window=None):
+        """Create a GLX window wrapping an X11 window for the given FBConfig.
+
+        Parameters
+        ----------
+        fbconfig:
+            FBConfig id (from :meth:`get_fb_configs`).
+        x_window:
+            Existing X11 window XID (must use a visual compatible with *fbconfig*).
+        screen:
+            Screen number (default: display default screen).
+        attrs:
+            Optional list of ``(attribute, value)`` pairs.
+        window:
+            Optional GLX window id; allocated if omitted (must differ from *x_window*).
+        """
+        x_window = int(x_window)
+        fbconfig = int(fbconfig)
+        if screen is None:
+            screen = self.display.config.get("screen", 0)
+        screen = int(screen)
         if window is None:
             window = self.display.resources.allocate()
-        self.display.write(pack_glx_create_window(self.code, window, fbconfig, x_window, attrs))
+        window = int(window)
+        # GLX window XID must be a fresh client ID, not the X11 window
+        if window == x_window or window == 0:
+            window = int(self.display.resources.allocate())
+        self.display.write(
+            pack_glx_create_window(
+                self.code,
+                window,
+                fbconfig,
+                x_window,
+                screen=screen,
+                attrs=attrs,
+            )
+        )
         return window
 
     async def destroy_window(self, window):
         """Destroy window."""
         self.display.write(pack_glx_destroy_window(self.code, window))
 
-    async def create_pbuffer(self, fbconfig, attrs=None, pbuffer=None):
+    async def create_pbuffer(self, fbconfig, attrs=None, pbuffer=None, screen=None):
         """Create pbuffer."""
         if pbuffer is None:
             pbuffer = self.display.resources.allocate()
-        self.display.write(pack_glx_create_pbuffer(self.code, pbuffer, fbconfig, attrs))
+        if screen is None:
+            screen = self.display.config.get("screen", 0)
+        self.display.write(pack_glx_create_pbuffer(self.code, pbuffer, fbconfig, screen=screen, attrs=attrs))
         return pbuffer
 
     async def destroy_pbuffer(self, pbuffer):

{aioxlib-0.3.0 → aioxlib-0.4.0}/aioxlib/protocol.py

@@ -643,14 +643,14 @@ def pack_clear_area(wnd, x, y, w, h, exposure=False):
 
 def pack_change_property(wid, property, property_type, format, data, mode):
     """Pack a wire-protocol change property request into ``bytes``."""
-    if not isinstance(data, (bytes, bytearray)):
+    if not isinstance(data, bytes | bytearray):
         format, data = encode_property_value(property_type, data, format)
     elif format is None:
         format = 8
 
     n = len(data)
     size = format // 8
-    if isinstance(data, (bytes, bytearray)):
+    if isinstance(data, bytes | bytearray):
         if n % size:
             n -= n % size
             raw = data[:n]
@@ -726,7 +726,7 @@ def encode_property_value(property_type, data, format=None):
       * ``list``/``tuple`` of ``str`` — NUL-separated STRING
       * ``list``/``tuple`` of ``int`` — format 16 or 32 array
     """
-    if isinstance(data, (bytes, bytearray)):
+    if isinstance(data, bytes | bytearray):
         return (format if format is not None else 8), bytes(data)
 
     if isinstance(data, str):
@@ -735,7 +735,7 @@ def encode_property_value(property_type, data, format=None):
     if isinstance(data, int):
         return (format if format is not None else 32), [data]
 
-    if isinstance(data, (list, tuple)):
+    if isinstance(data, list | tuple):
         if not data:
             return (format if format is not None else 32), []
         if isinstance(data[0], str):
@@ -813,13 +813,15 @@ def pack_list_extensions():
 def unpack_list_strings(data, n, offset):
     """Unpack a list strings reply or event from *data* starting at *offset*."""
     result = []
+    total = 0
     for _ in range(n):
         (size,) = struct.unpack_from("B", data, offset)
         offset += 1
         (text,) = struct.unpack_from(f"{size}s", data, offset)
         offset += size
+        total += 1 + size
         result.append(text.decode())
-    return result, offset
+    return result, offset + pad(total)
 
 
 def unpack_list_extensions(data: bytes, offset: int = 0):
@@ -829,7 +831,7 @@ def unpack_list_extensions(data: bytes, offset: int = 0):
     n = result["n"]
     offset += 24
     result["extensions"], offset = unpack_list_strings(data, n, offset)
-    return result, offset + 32 + result["length"] * 4
+    return result, offset
 
 
 def pack_query_extension(name) -> bytes:

{aioxlib-0.3.0 → aioxlib-0.4.0}/aioxlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioxlib
-Version: 0.3.0
+Version: 0.4.0
 Summary: Human friendly interface to XLib subsystems using asyncio python
 Author-email: Jose Tiago Macara Coutinho <coutinhotiago@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -52,6 +52,7 @@ The **root package** exposes the functional API and `get_display` only:
 import asyncio
 import aioxlib
 
+
 async def main():
     wnd = await aioxlib.create_window(640, 480, title="Hello from aioxlib")
     await wnd.show()
@@ -60,6 +61,7 @@ async def main():
         if wnd.is_delete_window(event):
             break
 
+
 asyncio.run(main())
 ```
 
@@ -69,6 +71,7 @@ asyncio.run(main())
 import asyncio
 import aioxlib
 
+
 async def main():
     display = await aioxlib.get_display()
     async with display:
@@ -80,6 +83,7 @@ async def main():
             if wnd.is_delete_window(event):
                 break
 
+
 asyncio.run(main())
 ```
 
@@ -134,5 +138,5 @@ GPLv3 or later — see [LICENSE](LICENSE).
 
 ## Author
 
-José Tiago Macara Coutinho  
+José Tiago Macara Coutinho
 <https://codeberg.org/tiagocoutinho>

{aioxlib-0.3.0 → aioxlib-0.4.0}/tests/test_glx.py

@@ -120,13 +120,13 @@ class TestGLXPack:
     def test_create_new_context_and_pbuffer(self):
         p = pack_glx_create_new_context(self.OPCODE, 0x10, 0x50, 0, 0x8014, 0, True)
         assert p[1] == GLXCommand.CreateNewContext
-        p = pack_glx_create_pbuffer(self.OPCODE, 0x60, 0x50, [(0x801D, 64), (0x801E, 64)])
+        p = pack_glx_create_pbuffer(self.OPCODE, 0x60, 0x50, 0, [(0x801D, 64), (0x801E, 64)])
         assert p[1] == GLXCommand.CreatePbuffer
         p = pack_glx_destroy_pbuffer(self.OPCODE, 0x60)
         assert p[1] == GLXCommand.DestroyPbuffer
 
     def test_window_and_attribs_arb(self):
-        p = pack_glx_create_window(self.OPCODE, 0x70, 0x50, 0x100, None)
+        p = pack_glx_create_window(self.OPCODE, 0x70, 0x50, 0x100, 0, None)
         assert p[1] == GLXCommand.CreateWindow
         p = pack_glx_destroy_window(self.OPCODE, 0x70)
         assert p[1] == GLXCommand.DestroyWindow
@@ -152,7 +152,7 @@ class TestGLXUnpack:
 
     def test_is_direct_reply(self):
         # n field in reply head is the is_direct flag
-        data = struct.pack("BBHI", 1, 1, 1, 0) + b"\0" * 24
+        data = struct.pack("BBHIB", 1, 1, 1, 0, 1) + b"\0" * 23
         r, _ = unpack_glx_is_direct(data)
         assert r["is_direct"] is True
 
@@ -235,7 +235,7 @@ class TestGLXClass:
     @pytest.mark.asyncio
     async def test_is_direct_and_swap(self, glx, display):
         async def write_read(payload, callback):
-            data = struct.pack("BBHI", 1, 1, 1, 0) + b"\0" * 24
+            data = struct.pack("BBHIB", 1, 1, 1, 0, 1) + b"\0" * 23
             return callback(data, 0)[0]
 
         display.write_read = write_read