Skip to content

option-wrapper: add option to load via section+option name #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ammen99 merged 1 commit into from
Sep 9, 2025
Merged

option-wrapper: add option to load via section+option name #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 28 additions & 18 deletions include/wayfire/config/option-wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <stdexcept>
#include <wayfire/config/option.hpp>
#include <wayfire/config/section.hpp>
#include <wayfire/config/compound-option.hpp>

namespace wf
Expand Down Expand Up @@ -77,25 +78,12 @@ class base_option_wrapper_t
*/
void load_option(const std::string& name)
{
if (raw_option)
{
throw std::logic_error(
"Loading an option into option wrapper twice!");
}

auto untyped_option = load_raw_option(name);
if (untyped_option == nullptr)
{
throw std::runtime_error("No such option: " + std::string(name));
}

raw_option = std::dynamic_pointer_cast<OptionType>(untyped_option);
if (raw_option == nullptr)
{
throw std::runtime_error("Bad option type: " + std::string(name));
}
_load_option(load_raw_option(name), name);
}

raw_option->add_updated_handler(&option_update_listener);
void load_option(std::shared_ptr<wf::config::section_t> section, const std::string& name)
{
_load_option(section->get_option_or(name), section->get_name() + "/" + name);
}

virtual ~base_option_wrapper_t()
Expand Down Expand Up @@ -162,5 +150,27 @@ class base_option_wrapper_t
*/
virtual std::shared_ptr<wf::config::option_base_t> load_raw_option(
const std::string& name) = 0;

void _load_option(std::shared_ptr<wf::config::option_base_t> _option, const std::string& name)
{
if (raw_option)
{
throw std::logic_error(
"Loading an option into option wrapper twice!");
}

if (_option == nullptr)
{
throw std::runtime_error("No such option: " + std::string(name));
}

raw_option = std::dynamic_pointer_cast<OptionType>(_option);
if (raw_option == nullptr)
{
throw std::runtime_error("Bad option type: " + name);
}

raw_option->add_updated_handler(&option_update_listener);
}
};
}