Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions include/wayland/mir/wayland/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,14 @@ class Resource;
class Client : public wayland::LifetimeTracker
{
public:
/// Returns the Client object for the given libwayland client
static auto from(wl_client const* client) -> Client&;

/// The underlying Wayland client
virtual auto raw_client() const -> wl_client* = 0;

/// True if the client's destroy listener has fired. The client object continues to exist after this until all
/// resources have been cleaned up.
virtual auto is_being_destroyed() const -> bool = 0;

/// The Mir session associated with this client. Be careful when using this that it's actually the session you want.
/// All clients have a session but the surfaces they create may get associated with additional sessions.
///
/// For example all surfaces from a single XWayland server are attached to a single Client with a single cleint
/// For example all surfaces from a single XWayland server are attached to a single Client with a single client
/// session, but their scene::Surfaces are associated with multiple sessions created in the XWayland frontend for
/// individual apps.
virtual auto client_session() const -> std::shared_ptr<scene::Session> = 0;
Expand All @@ -72,14 +66,6 @@ class Client : public wayland::LifetimeTracker
virtual void set_output_geometry_scale(float scale) = 0;
virtual auto output_geometry_scale() -> float = 0;
/// @}

protected:
static void register_client(wl_client const* raw, std::shared_ptr<Client> const& shared);
static void unregister_client(wl_client const* raw);

private:
friend Resource;
static auto shared_from(wl_client const* client) -> std::shared_ptr<Client>;
};
}
}
Expand Down
47 changes: 0 additions & 47 deletions include/wayland/mir/wayland/global.h

This file was deleted.

61 changes: 0 additions & 61 deletions include/wayland/mir/wayland/protocol_error.h

This file was deleted.

52 changes: 0 additions & 52 deletions include/wayland/mir/wayland/resource.h

This file was deleted.

26 changes: 0 additions & 26 deletions include/wayland/mir/wayland/wayland_base.h

This file was deleted.

115 changes: 0 additions & 115 deletions include/wayland/mir/wayland/weak.h

This file was deleted.

1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ add_subdirectory(platforms/)
add_subdirectory(common/)

add_subdirectory(platform/)
add_subdirectory(wayland/)
add_subdirectory(server/)
add_subdirectory(miral/)
add_subdirectory(miroil/)
Expand Down
9 changes: 1 addition & 8 deletions src/server/frontend_wayland/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ set(
wayland_default_configuration.cpp
wayland_connector.cpp wayland_connector.h
wl_client.cpp wl_client.h
wayland_executor.cpp wayland_executor.h
wayland_surface_observer.cpp wayland_surface_observer.h
wayland_input_dispatcher.cpp wayland_input_dispatcher.h
wl_data_device_manager.cpp wl_data_device_manager.h
Expand Down Expand Up @@ -128,13 +127,7 @@ target_link_libraries(mirfrontend-wayland
mirplatform
mircommon
mircore
mirwayland_rs
PRIVATE
PkgConfig::GIOUnix
)

if (MIR_ENABLE_RUST)
target_link_libraries(mirfrontend-wayland
PUBLIC
mirwayland_rs
)
endif()
Loading
Loading