Added the files I forgot to add

pull/1899/head
Julia 2022-12-21 21:09:38 +01:00
parent a3bb9706fb
commit 7952846e07
4 changed files with 10 additions and 1 deletions

View File

@ -11,6 +11,7 @@
#include "modules/sway/mode.hpp" #include "modules/sway/mode.hpp"
#include "modules/sway/scratchpad.hpp" #include "modules/sway/scratchpad.hpp"
#include "modules/sway/window.hpp" #include "modules/sway/window.hpp"
#include "modules/sway/windows.hpp"
#include "modules/sway/workspaces.hpp" #include "modules/sway/workspaces.hpp"
#endif #endif
#ifdef HAVE_WLR #ifdef HAVE_WLR

View File

@ -197,6 +197,7 @@ src_files += [
'src/modules/sway/mode.cpp', 'src/modules/sway/mode.cpp',
'src/modules/sway/language.cpp', 'src/modules/sway/language.cpp',
'src/modules/sway/window.cpp', 'src/modules/sway/window.cpp',
'src/modules/sway/windows.cpp',
'src/modules/sway/workspaces.cpp', 'src/modules/sway/workspaces.cpp',
'src/modules/sway/scratchpad.cpp' 'src/modules/sway/scratchpad.cpp'
] ]

View File

@ -32,6 +32,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const {
if (ref == "sway/window") { if (ref == "sway/window") {
return new waybar::modules::sway::Window(id, bar_, config_[name]); return new waybar::modules::sway::Window(id, bar_, config_[name]);
} }
if (ref == "sway/windows") {
return new waybar::modules::sway::Windows(id, bar_, config_[name]);
}
if (ref == "sway/language") { if (ref == "sway/language") {
return new waybar::modules::sway::Language(id, config_[name]); return new waybar::modules::sway::Language(id, config_[name]);
} }

View File

@ -24,12 +24,16 @@ BarIpcClient::BarIpcClient(waybar::Bar& bar) : bar_{bar} {
subscribe_events.append("barconfig_update"); subscribe_events.append("barconfig_update");
bool has_mode = isModuleEnabled("sway/mode"); bool has_mode = isModuleEnabled("sway/mode");
bool has_windows = isModuleEnabled("sway/windows");
bool has_workspaces = isModuleEnabled("sway/workspaces"); bool has_workspaces = isModuleEnabled("sway/workspaces");
if (has_mode) { if (has_mode) {
subscribe_events.append("mode"); subscribe_events.append("mode");
} }
if (has_workspaces) { if (has_windows) {
subscribe_events.append("window");
}
if (has_workspaces||has_windows) {
subscribe_events.append("workspace"); subscribe_events.append("workspace");
} }
if (has_mode || has_workspaces) { if (has_mode || has_workspaces) {