Skip to content
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

Jump to bottom

Reload window-rules on config change #877

Merged
merged 4 commits into from
Nov 25, 2020
Merged

Reload window-rules on config change #877

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55978a0
Reload window-rules on config change
marcusbritanicus Nov 17, 2020
4e4133b
Merge branch 'master' of https://github.com/WayfireWM/wayfire
marcusbritanicus Nov 21, 2020
73293ca
Merge branch 'master' of https://github.com/WayfireWM/wayfire
marcusbritanicus Nov 23, 2020
51bd8b3
Switching to wf::signal_connection_t
marcusbritanicus Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 51 additions & 47 deletions plugins/window-rules/window-rules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,84 +26,71 @@ class wayfire_window_rules_t : public wf::plugin_interface_t
void apply(const std::string & signal, wf::signal_data_t *data);

private:
void setup_rules_from_config();
wf::lexer_t _lexer;

wf::signal_callback_t _created;
wf::signal_callback_t _maximized;
wf::signal_callback_t _unmaximized;
wf::signal_callback_t _minimized;
wf::signal_callback_t _fullscreened;

std::vector<std::shared_ptr<wf::rule_t>> _rules;

wf::view_access_interface_t _access_interface;
wf::view_action_interface_t _action_interface;

nonstd::observer_ptr<wf::lambda_rules_registrations_t> _lambda_registrations;
};

void wayfire_window_rules_t::init()
{
// Get the lambda rules registrations.
_lambda_registrations = wf::lambda_rules_registrations_t::get_instance();
_lambda_registrations->window_rule_instances++;

// Build rule list.
auto section = wf::get_core().config.get_section("window-rules");
for (auto opt : section->get_registered_options())
{
_lexer.reset(opt->get_value_str());
auto rule = wf::rule_parser_t().parse(_lexer);
if (rule != nullptr)
{
_rules.push_back(rule);
}
}

// Created rule handler.
_created = [=] (wf::signal_data_t *data)
wf::signal_connection_t _created = [=] (wf::signal_data_t *data)
{
apply("created", data);
};
output->connect_signal("view-mapped", &_created);

// Maximized rule handler.
_maximized = [=] (wf::signal_data_t *data)
wf::signal_connection_t _maximized = [=] (wf::signal_data_t *data)
{
apply("maximized", data);
};
output->connect_signal("view-tiled", &_maximized);

// Unaximized rule handler.
_unmaximized = [=] (wf::signal_data_t *data)
wf::signal_connection_t _unmaximized = [=] (wf::signal_data_t *data)
{
apply("unmaximized", data);
};
output->connect_signal("view-tiled", &_unmaximized);

// Minimized rule handler.
_minimized = [=] (wf::signal_data_t *data)
wf::signal_connection_t _minimized = [=] (wf::signal_data_t *data)
{
apply("minimized", data);
};
output->connect_signal("view-minimized", &_minimized);

// Fullscreened rule handler.
_fullscreened = [=] (wf::signal_data_t *data)
wf::signal_connection_t _fullscreened = [=] (wf::signal_data_t *data)
{
apply("fullscreened", data);
};

// Auto-reload on changes to config file
wf::signal_connection_t _reload_config = [=] (wf::signal_data_t*)
{
setup_rules_from_config();
};

std::vector<std::shared_ptr<wf::rule_t>> _rules;

wf::view_access_interface_t _access_interface;
wf::view_action_interface_t _action_interface;

nonstd::observer_ptr<wf::lambda_rules_registrations_t> _lambda_registrations;
};

void wayfire_window_rules_t::init()
{
// Get the lambda rules registrations.
_lambda_registrations = wf::lambda_rules_registrations_t::get_instance();
_lambda_registrations->window_rule_instances++;

setup_rules_from_config();

output->connect_signal("view-mapped", &_created);
output->connect_signal("view-tiled", &_maximized);
output->connect_signal("view-tiled", &_unmaximized);
output->connect_signal("view-minimized", &_minimized);
output->connect_signal("view-fullscreen", &_fullscreened);
wf::get_core().connect_signal("reload-config", &_reload_config);
}

void wayfire_window_rules_t::fini()
{
output->disconnect_signal("view-mapped", &_created);
output->disconnect_signal("view-tiled", &_maximized);
output->disconnect_signal("view-tiled", &_unmaximized);
output->disconnect_signal("view-minimized", &_minimized);
output->disconnect_signal("view-fullscreen", &_fullscreened);

_lambda_registrations->window_rule_instances--;
if (_lambda_registrations->window_rule_instances == 0)
{
Expand Down Expand Up @@ -203,4 +190,21 @@ void wayfire_window_rules_t::apply(const std::string & signal,
}
}

void wayfire_window_rules_t::setup_rules_from_config()
{
_rules.clear();

// Build rule list.
auto section = wf::get_core().config.get_section("window-rules");
for (auto opt : section->get_registered_options())
{
_lexer.reset(opt->get_value_str());
auto rule = wf::rule_parser_t().parse(_lexer);
if (rule != nullptr)
{
_rules.push_back(rule);
}
}
}

DECLARE_WAYFIRE_PLUGIN(wayfire_window_rules_t);