aioxlib 0.6.0__tar.gz → 0.7.1__tar.gz

{aioxlib-0.6.0 → aioxlib-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioxlib
-Version: 0.6.0
+Version: 0.7.1
 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

{aioxlib-0.6.0 → aioxlib-0.7.1}/aioxlib/__init__.py

@@ -16,7 +16,7 @@ Types and protocol helpers live in submodules::
     from aioxlib.protocol import pack_create_window
 """
 
-__version__ = "0.6.0"
+__version__ = "0.7.1"
 
 from . import api, constants
 from .api import *  # noqa: F403

{aioxlib-0.6.0 → aioxlib-0.7.1}/aioxlib/constants.py

@@ -540,28 +540,6 @@ InputOutput = 1
 
 InputOnly = 2
 
-ForgetGravity = 0
-
-NorthWestGravity = 1
-
-NorthGravity = 2
-
-NorthEastGravity = 3
-
-WestGravity = 4
-
-CenterGravity = 5
-
-EastGravity = 6
-
-SouthWestGravity = 7
-
-SouthGravity = 8
-
-SouthEastGravity = 9
-
-StaticGravity = 10
-
 UnmapGravity = 0
 
 NotUseful = 0
@@ -865,6 +843,88 @@ class VisualClass(enum.IntEnum):
     DirectColor = 5
 
 
+# Atom name / type used by the Motif specification
+MOTIF_WM_HINTS_ATOM = "_MOTIF_WM_HINTS"
+
+
+class MotifHintsFlag(enum.IntFlag):
+    """Bits for the ``flags`` field — which of the following fields are valid."""
+
+    FUNCTIONS = 1 << 0
+    DECORATIONS = 1 << 1
+    INPUT_MODE = 1 << 2
+    STATUS = 1 << 3
+
+
+class MotifFunc(enum.IntFlag):
+    """Bits for the ``functions`` field — operations the user may perform."""
+
+    ALL = 1 << 0
+    RESIZE = 1 << 1
+    MOVE = 1 << 2
+    MINIMIZE = 1 << 3
+    MAXIMIZE = 1 << 4
+    CLOSE = 1 << 5
+
+
+class MotifDecor(enum.IntFlag):
+    """Bits for the ``decorations`` field — chrome drawn by the WM."""
+
+    ALL = 1 << 0
+    BORDER = 1 << 1
+    RESIZEH = 1 << 2
+    TITLE = 1 << 3
+    MENU = 1 << 4
+    MINIMIZE = 1 << 5
+    MAXIMIZE = 1 << 6
+
+
+class MotifInputMode(enum.IntEnum):
+    """Values for the ``input_mode`` field."""
+
+    MODELESS = 0
+    PRIMARY_APPLICATION_MODAL = 1
+    SYSTEM_MODAL = 2
+    FULL_APPLICATION_MODAL = 3
+
+
+XSIZE_HINTS_LEN = 18
+
+
+class SizeHintsFlag(enum.IntFlag):
+    """Bits for the ``flags`` field — which of the following fields are valid.
+
+    Values match the ICCCM / Xlib ``XSizeHints`` definition.
+    """
+
+    USPosition = 1 << 0  # user-specified x, y
+    USSize = 1 << 1  # user-specified width, height
+    PPosition = 1 << 2  # program-specified position
+    PSize = 1 << 3  # program-specified size
+    PMinSize = 1 << 4  # program-specified minimum size
+    PMaxSize = 1 << 5  # program-specified maximum size
+    PResizeInc = 1 << 6  # program-specified resize increments
+    PAspect = 1 << 7  # program-specified min/max aspect ratios
+    PBaseSize = 1 << 8  # program-specified base size
+    PWinGravity = 1 << 9  # program-specified window gravity
+
+
+class WinGravity(enum.IntEnum):
+    """Window gravity values used with ``PWinGravity``."""
+
+    Forget = 0
+    NorthWest = 1
+    North = 2
+    NorthEast = 3
+    West = 4
+    Center = 5
+    East = 6
+    SouthWest = 7
+    South = 8
+    SouthEast = 9
+    Static = 10
+
+
 LSBFirst = 0
 
 MSBFirst = 1
@@ -977,17 +1037,6 @@ __all__ = [
     "LastExtensionError",
     "InputOutput",
     "InputOnly",
-    "ForgetGravity",
-    "NorthWestGravity",
-    "NorthGravity",
-    "NorthEastGravity",
-    "WestGravity",
-    "CenterGravity",
-    "EastGravity",
-    "SouthWestGravity",
-    "SouthGravity",
-    "SouthEastGravity",
-    "StaticGravity",
     "UnmapGravity",
     "NotUseful",
     "WhenMapped",
@@ -1094,6 +1143,11 @@ __all__ = [
     "EnableAccess",
     "DisableAccess",
     "VisualClass",
+    "MOTIF_WM_HINTS_ATOM",
+    "MotifHintsFlag",
+    "MotifFunc",
+    "MotifDecor",
+    "MotifInputMode",
     "LSBFirst",
     "MSBFirst",
     "GenericEventCode",

{aioxlib-0.6.0 → aioxlib-0.7.1}/aioxlib/display.py

@@ -22,6 +22,7 @@ from .constants import (
     BYTE_ORDER_TEXT,
     DEFAULT_STRING_ENCODING,
     DISPLAY_RE,
+    MOTIF_WM_HINTS_ATOM,
     NONE,
     Allocate,
     AnyPropertyType,
@@ -34,10 +35,13 @@ from .constants import (
     PropMode,
     StackMode,
     Status,
+    WinGravity,
 )
 from .protocol import (
     X11Error,
     build_font,
+    build_motif_wm_hints,
+    build_size_hints,
     pack_change_property,
     pack_clear_area,
     pack_configure_window,
@@ -76,10 +80,8 @@ from .protocol import (
     pack_set_input_focus,
     pack_setup,
     pack_unmap_window,
-    unpack_client_message,
     unpack_error,
     unpack_event,
-    unpack_expose_event,
     unpack_get_atom_name,
     unpack_get_font_path,
     unpack_get_geometry,
@@ -315,20 +317,11 @@ class Window(Drawable):
         display = self.display
         protocols = []
         if delete_on_close or take_focus:
-            # Atoms are normally cached in Display.__aenter__; fall back to
-            # get_atom so create_window still works before the context is entered.
-            async def _atom(attr, name):
-                value = getattr(display, attr, None)
-                if value is None:
-                    value = await display.get_atom(name)
-                    setattr(display, attr, value)
-                return value
-
             if delete_on_close:
-                protocols.append(await _atom("WM_DELETE_WINDOW", "WM_DELETE_WINDOW"))
+                protocols.append(display.WM_DELETE_WINDOW)
             if take_focus:
-                protocols.append(await _atom("WM_TAKE_FOCUS", "WM_TAKE_FOCUS"))
-            wm_protocols = await _atom("WM_PROTOCOLS", "WM_PROTOCOLS")
+                protocols.append(display.WM_TAKE_FOCUS)
+            wm_protocols = display.WM_PROTOCOLS
             payload += pack_change_property(wid, wm_protocols, Atom.ATOM, 32, protocols, PropMode.Replace)
         self.display.connection.write(payload)
         return Window(self.display, wid)
@@ -337,6 +330,88 @@ class Window(Drawable):
         """Set name."""
         await self.change_text_property(Atom.WM_NAME, name)
 
+    async def set_motif_hints(self, functions=None, decorations=None, input_mode=None, status=None):
+        data = build_motif_wm_hints(
+            functions=functions,
+            decorations=decorations,
+            input_mode=input_mode,
+            status=status,
+        )
+        atom = await self.display.get_atom(MOTIF_WM_HINTS_ATOM)
+        await self.change_property(atom, atom, 32, list(data))
+
+    async def set_size_hints(
+        self,
+        x: int | None = None,
+        y: int | None = None,
+        width: int | None = None,
+        height: int | None = None,
+        min_width: int | None = None,
+        min_height: int | None = None,
+        max_width: int | None = None,
+        max_height: int | None = None,
+        width_inc: int | None = None,
+        height_inc: int | None = None,
+        min_aspect: tuple[int, int] | None = None,
+        max_aspect: tuple[int, int] | None = None,
+        base_width: int | None = None,
+        base_height: int | None = None,
+        win_gravity: WinGravity | int | None = None,
+        user_position: bool = False,
+        user_size: bool = False,
+    ) -> None:
+        """Apply ICCCM size hints to *window*.
+
+        Pass individual fields, or supply a pre-built 18-element list via *data*.
+        When *data* is given it takes precedence over the keyword fields.
+
+        Examples
+        --------
+        Fixed size (non-resizable)::
+
+            await set_size_hints(wnd, min_width=400, min_height=300,
+                                max_width=400, max_height=300)
+
+        Minimum size only::
+
+            await set_size_hints(wnd, min_width=200, min_height=150)
+
+        Character-cell style increments (e.g. terminal)::
+
+            await set_size_hints(
+                wnd,
+                base_width=10, base_height=20,
+                width_inc=8, height_inc=16,
+                min_width=10 + 8 * 20, min_height=20 + 16 * 5,
+            )
+        """
+        data = build_size_hints(
+            x=x,
+            y=y,
+            width=width,
+            height=height,
+            min_width=min_width,
+            min_height=min_height,
+            max_width=max_width,
+            max_height=max_height,
+            width_inc=width_inc,
+            height_inc=height_inc,
+            min_aspect=min_aspect,
+            max_aspect=max_aspect,
+            base_width=base_width,
+            base_height=base_height,
+            win_gravity=win_gravity,
+            user_position=user_position,
+            user_size=user_size,
+        )
+
+        await self.change_property(
+            Atom.WM_NORMAL_HINTS,
+            Atom.WM_SIZE_HINTS,
+            32,
+            list(data),
+        )
+
     async def change_text_property(self, property, data, property_type=Atom.STRING, mode=PropMode.Replace):
         """Change text property."""
         if not isinstance(data, bytes):
@@ -574,10 +649,7 @@ class Display:
         self.commands = {cmd: cmd.name for cmd in Command}
         self.requests = asyncio.Queue()
         self.listeners = set()
-        self._events = {
-            EventType.ClientMessage: unpack_client_message,
-            EventType.Expose: unpack_expose_event,
-        }
+        self._events = {}
         self._atom_cache = {}
         self._extensions_cache = None
         self._task = None

{aioxlib-0.6.0 → aioxlib-0.7.1}/aioxlib/glx.py

@@ -935,6 +935,7 @@ def pack_glx_create_context_attribs_arb(
 def unpack_glx_pbuffer_clobber(data, offset=0):
     """Unpack a glx pbuffer clobber reply or event from *data* starting at *offset*."""
     raw = data[offset : offset + 32]
+    raw_event_type = data[offset]
     event_type, draw_type = struct.unpack_from("HH", raw, 4)
     drawable, b_mask = struct.unpack_from("II", raw, 8)
     aux, x, y, w, h, count = struct.unpack_from("HHHHHH", raw, 16)
@@ -950,12 +951,15 @@ def unpack_glx_pbuffer_clobber(data, offset=0):
         "width": w,
         "height": h,
         "count": count,
+        "code": raw_event_type & 0x7F,
+        "from_send": bool(raw_event_type & 0x80),
     }, offset + 32
 
 
 def unpack_glx_buffer_swap_complete(data, offset=0):
     """Unpack a glx buffer swap complete reply or event from *data* starting at *offset*."""
     raw = data[offset : offset + 32]
+    raw_event_type = data[offset]
     (event_type,) = struct.unpack_from("H", raw, 4)
     drawable = struct.unpack_from("I", raw, 8)[0]
     ust_hi, ust_lo, msc_hi, msc_lo, sbc = struct.unpack_from("IIIII", raw, 12)
@@ -966,6 +970,9 @@ def unpack_glx_buffer_swap_complete(data, offset=0):
         "ust": (ust_hi << 32) | ust_lo,
         "msc": (msc_hi << 32) | msc_lo,
         "sbc": sbc,
+        "raw_code": raw_event_type,
+        "code": raw_event_type & 0x7F,
+        "from_send": bool(raw_event_type & 0x80),
     }, offset + 32
 
 

{aioxlib-0.6.0 → aioxlib-0.7.1}/aioxlib/present.py

@@ -178,6 +178,8 @@ def unpack_present_complete_notify(data, offset=0):
         "event_type": etype,
         "serial": serial,
         "uid": uid,
+        "code": data[offset] & 0x7F,
+        "from_send": data[offset] & 0x80,
     }, offset + 32