This commit is contained in:
Makesesama 2025-05-06 13:15:44 +02:00
parent f8b352d624
commit 0cf1c5aeb7
7 changed files with 22 additions and 59 deletions

View File

@ -16,14 +16,8 @@
from __future__ import annotations from __future__ import annotations
from pywayland.protocol_core import ( from pywayland.protocol_core import (Argument, ArgumentType, Global, Interface,
Argument, Proxy, Resource)
ArgumentType,
Global,
Interface,
Proxy,
Resource,
)
class ZriverCommandCallbackV1(Interface): class ZriverCommandCallbackV1(Interface):

View File

@ -16,14 +16,8 @@
from __future__ import annotations from __future__ import annotations
from pywayland.protocol_core import ( from pywayland.protocol_core import (Argument, ArgumentType, Global, Interface,
Argument, Proxy, Resource)
ArgumentType,
Global,
Interface,
Proxy,
Resource,
)
from ..wayland import WlSeat from ..wayland import WlSeat
from .zriver_command_callback_v1 import ZriverCommandCallbackV1 from .zriver_command_callback_v1 import ZriverCommandCallbackV1

View File

@ -16,14 +16,8 @@
from __future__ import annotations from __future__ import annotations
from pywayland.protocol_core import ( from pywayland.protocol_core import (Argument, ArgumentType, Global, Interface,
Argument, Proxy, Resource)
ArgumentType,
Global,
Interface,
Proxy,
Resource,
)
class ZriverOutputStatusV1(Interface): class ZriverOutputStatusV1(Interface):

View File

@ -16,16 +16,9 @@
from __future__ import annotations from __future__ import annotations
from pywayland.protocol_core import (
Argument,
ArgumentType,
Global,
Interface,
Proxy,
Resource,
)
from pywayland.protocol.wayland import WlOutput from pywayland.protocol.wayland import WlOutput
from pywayland.protocol_core import (Argument, ArgumentType, Global, Interface,
Proxy, Resource)
class ZriverSeatStatusV1(Interface): class ZriverSeatStatusV1(Interface):

View File

@ -16,17 +16,10 @@
from __future__ import annotations from __future__ import annotations
from pywayland.protocol_core import ( from pywayland.protocol.wayland import WlOutput, WlSeat
Argument, from pywayland.protocol_core import (Argument, ArgumentType, Global, Interface,
ArgumentType, Proxy, Resource)
Global,
Interface,
Proxy,
Resource,
)
from pywayland.protocol.wayland import WlOutput
from pywayland.protocol.wayland import WlSeat
from .zriver_output_status_v1 import ZriverOutputStatusV1 from .zriver_output_status_v1 import ZriverOutputStatusV1
from .zriver_seat_status_v1 import ZriverSeatStatusV1 from .zriver_seat_status_v1 import ZriverSeatStatusV1

View File

@ -1,21 +1,18 @@
import os import os
import threading
import time import time
from loguru import logger
from dataclasses import dataclass, field from dataclasses import dataclass, field
from typing import Dict, List, Optional, Any, Set from typing import Any, Dict, List, Optional, Set
from fabric.core.service import Service, Signal, Property from fabric.core.service import Property, Service, Signal
from fabric.utils.helpers import idle_add from fabric.utils.helpers import idle_add
from gi.repository import GLib
from loguru import logger
# Import pywayland components - ensure these imports are correct # Import pywayland components - ensure these imports are correct
from pywayland.client import Display from pywayland.client import Display
from pywayland.protocol.wayland import WlOutput, WlSeat from pywayland.protocol.wayland import WlOutput, WlSeat
from .generated.river_control_unstable_v1 import ZriverControlV1
from .generated.river_status_unstable_v1 import ZriverStatusManagerV1 from .generated.river_status_unstable_v1 import ZriverStatusManagerV1
from gi.repository import (
Gio,
GLib,
)
@dataclass @dataclass
@ -103,7 +100,6 @@ class River(Service):
"seat_status": None, "seat_status": None,
} }
# Set up registry handlers - using more direct approach like your example
def handle_global(registry, name, iface, version): def handle_global(registry, name, iface, version):
logger.debug( logger.debug(
f"[RiverService] Global: {iface} (v{version}, name={name})" f"[RiverService] Global: {iface} (v{version}, name={name})"

View File

@ -1,14 +1,13 @@
from loguru import logger
from fabric.core.service import Property from fabric.core.service import Property
from fabric.widgets.button import Button from fabric.utils.helpers import bulk_connect
from fabric.widgets.box import Box from fabric.widgets.box import Box
from fabric.widgets.button import Button
from fabric.widgets.eventbox import EventBox from fabric.widgets.eventbox import EventBox
from fabric.widgets.label import Label from fabric.widgets.label import Label
from fabric.utils.helpers import bulk_connect
from .service import River
from gi.repository import Gdk from gi.repository import Gdk
from loguru import logger
from .service import River
_connection: River | None = None _connection: River | None = None