From e5d981faf958ec46f34e9b2c905bd56b63480ff5 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Tue, 11 Oct 2016 15:28:14 +0200 Subject: [PATCH] refactor(menu): Menu module logic --- README.md | 6 ++- include/modules/menu.hpp | 108 +++++++++++++++++++-------------------- 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index e6eff98f..cd30fb20 100644 --- a/README.md +++ b/README.md @@ -1034,10 +1034,14 @@ See [the bspwm module](#module-internalbspwm) for details on `label-dimmed`. ; Available tags: ; (default) - gets replaced with ; (default) - ;f-ormat = + ;format = label-open = Apps label-close = x + + ; Optional item separator + ; Default: none + label-separator = | ~~~ diff --git a/include/modules/menu.hpp b/include/modules/menu.hpp index 28e95912..f3a6752c 100644 --- a/include/modules/menu.hpp +++ b/include/modules/menu.hpp @@ -20,54 +20,44 @@ namespace modules { using static_module::static_module; void setup() { - auto default_format_string = string{TAG_LABEL_TOGGLE} + " " + string{TAG_MENU}; + string default_format{TAG_LABEL_TOGGLE + string{" "} + TAG_MENU}; - m_formatter->add(DEFAULT_FORMAT, default_format_string, {TAG_LABEL_TOGGLE, TAG_MENU}); + m_formatter->add(DEFAULT_FORMAT, default_format, {TAG_LABEL_TOGGLE, TAG_MENU}); if (m_formatter->has(TAG_LABEL_TOGGLE)) { m_labelopen = get_config_label(m_conf, name(), "label-open"); m_labelclose = get_optional_config_label(m_conf, name(), "label-close", "x"); } - if (m_formatter->has(TAG_MENU)) { - int level_n = 0; + m_labelseparator = get_optional_config_label(m_conf, name(), "label-separator", ""); + + if (!m_formatter->has(TAG_MENU)) + return; + + while (true) { + string level_param{"menu-" + to_string(m_levels.size())}; + + if (m_conf.get(name(), level_param + "-0", "").empty()) + break; + + m_log.trace("%s: Creating menu level %i", name(), m_levels.size()); + m_levels.emplace_back(make_unique()); while (true) { - auto level_path = "menu-" + to_string(level_n); + string item_param{level_param + "-" + to_string(m_levels.back()->items.size())}; - if (m_conf.get(name(), level_path + "-0", "") == "") + if (m_conf.get(name(), item_param, "").empty()) break; - m_levels.emplace_back(make_unique()); - - int item_n = 0; - - while (true) { - auto item_path = level_path + "-" + to_string(item_n); - - if (m_conf.get(name(), item_path, "") == "") - break; - - auto item = make_unique(); - - item->label = get_config_label(m_conf, name(), item_path); - item->exec = m_conf.get(name(), item_path + "-exec", EVENT_MENU_CLOSE); - - m_levels.back()->items.emplace_back(std::move(item)); - - item_n++; - } - - level_n++; + m_log.trace("%s: Creating menu level item %i", name(), m_levels.back()->items.size()); + auto item = make_unique(); + item->label = get_config_label(m_conf, name(), item_param); + item->exec = m_conf.get(name(), item_param + "-exec", EVENT_MENU_CLOSE); + m_levels.back()->items.emplace_back(std::move(item)); } } } - string get_output() { - m_builder->node(module::get_output()); - return m_builder->flush(); - } - bool build(builder* builder, string tag) { if (tag == TAG_LABEL_TOGGLE && m_level == -1) { builder->cmd(mousebtn::LEFT, string(EVENT_MENU_OPEN) + "0"); @@ -78,17 +68,13 @@ namespace modules { builder->node(m_labelclose); builder->cmd_close(true); } else if (tag == TAG_MENU && m_level > -1) { - int i = 0; - - for (auto&& m : m_levels[m_level]->items) { - if (i++ > 0) + for (auto&& item : m_levels[m_level]->items) { + if (item != m_levels[m_level]->items.front()) builder->space(); - builder->color_alpha("77"); - builder->node("/"); - builder->color_close(true); - builder->space(); - builder->cmd(mousebtn::LEFT, m->exec); - builder->node(m->label); + if (*m_labelseparator) + builder->node(m_labelseparator, true); + builder->cmd(mousebtn::LEFT, item->exec); + builder->node(item->label); builder->cmd_close(true); } } else { @@ -98,6 +84,23 @@ namespace modules { } bool handle_event(string cmd) { + if (cmd.compare(0, 4, "menu") != 0) + return false; + + // broadcast update when leaving leaving the function + auto exit_handler = scope_util::make_exit_handler<>([this]() { + if (!m_threads.empty()) { + m_log.trace("%s: Cleaning up previous broadcast threads", name()); + for (auto&& thread : m_threads) + if (thread.joinable()) + thread.join(); + m_threads.clear(); + } + + m_log.trace("%s: Dispatching broadcast thread", name()); + m_threads.emplace_back(thread(&menu_module::broadcast, this)); + }); + if (cmd.compare(0, strlen(EVENT_MENU_OPEN), EVENT_MENU_OPEN) == 0) { auto level = cmd.substr(strlen(EVENT_MENU_OPEN)); @@ -105,22 +108,17 @@ namespace modules { level = "0"; m_level = std::atoi(level.c_str()); + m_log.info("%s: Opening menu level '%i'", name(), static_cast(m_level)); - if (m_level >= (int)m_levels.size()) { - m_log.err("%s: Cannot open unexisting menu level '%d'", name(), level); + if (static_cast(m_level) >= m_levels.size()) { + m_log.warn("%s: Cannot open unexisting menu level '%i'", name(), level); m_level = -1; } - } else if (cmd == EVENT_MENU_CLOSE) { + m_log.info("%s: Closing menu tree", name()); m_level = -1; - } else { - m_level = -1; - broadcast(); - return false; } - broadcast(); - return true; } @@ -135,11 +133,13 @@ namespace modules { static constexpr auto EVENT_MENU_OPEN = "menu_open-"; static constexpr auto EVENT_MENU_CLOSE = "menu_close"; - int m_level = -1; - vector> m_levels; - label_t m_labelopen; label_t m_labelclose; + label_t m_labelseparator; + + vector> m_levels; + + std::atomic m_level{-1}; }; }