Provide a configuration mechanism for enabling the supported Wayland extensions #538
Conversation
|
Is this intended to include a WLCS sync? |
Oops! No. Let me fix... |
AlanGriffiths
force-pushed
the
select-wl-extensions
branch
from
072c301
to
d3ecfb5
Compare
| std::set<std::string> selected_extension; | ||
| auto extensions_ = extensions + ':'; | ||
|
|
||
| for (char const* start = extensions_.c_str(); char const* end = strchr(start, ':'); start = end+1) |
There was a problem hiding this comment.
Not a problem, but seems a bit hacky to do this with C strings and strchr, instead of std::string::find.
There was a problem hiding this comment.
Sometimes the C API leads to clearer code. IMO the C++ version is too verbose.
| protected: | ||
| virtual void custom_extensions( | ||
| wl_display* display, | ||
| std::shared_ptr<mf::Shell> const& shell, | ||
| mf::WlSeat* seat, | ||
| mf::OutputManager* const output_manager) | ||
| { | ||
| if (!getenv("MIR_DISABLE_XDG_SHELL_V6_UNSTABLE")) | ||
| add_extension("zxdg_shell_v6", std::make_shared<mf::XdgShellV6>(display, shell, *seat, output_manager)); | ||
| if (extension.find(wl_shell) != extension.end()) |
There was a problem hiding this comment.
Another extension could, theoretically, have a name that contains "wl_shell".
if ((":" + extension + ":").find(":" + wl_shel +":") != extension.end())
Would be uglier, but more technically correct IMO
There was a problem hiding this comment.
There's probably also a leaner way to do this.
There was a problem hiding this comment.
@wmww That code is looking for a value "wl_shell" in a set. It doesn't match a value containing "wl_shell".
There was a problem hiding this comment.
Oh, oops. I thought I read that carefully.
|
bors r+ |
Merge conflict |
|
bors r+ |
538: Provide a configuration mechanism for enabling the supported Wayland extensions r=wmww a=AlanGriffiths This provides a foundation for future development. But this is likely to gain complexity over time: * A shell may want to validate the selected extensions. * Some extensions may be mutually incompatible. * We may want to change the default from "enable everything". Co-authored-by: Alan Griffiths <alan@octopull.co.uk> Co-authored-by: William Wold <9331264+wmww@users.noreply.github.com>
Build failed |
|
3rd times the charm |
538: Provide a configuration mechanism for enabling the supported Wayland extensions r=wmww a=AlanGriffiths This provides a foundation for future development. But this is likely to gain complexity over time: * A shell may want to validate the selected extensions. * Some extensions may be mutually incompatible. * We may want to change the default from "enable everything". Co-authored-by: Alan Griffiths <alan@octopull.co.uk> Co-authored-by: William Wold <9331264+wmww@users.noreply.github.com>
Build succeeded |
This provides a foundation for future development.
But this is likely to gain complexity over time: