pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): Be more clean why the module is invalid

Browse Source
This commit is contained in:
Michael Carlberg 2016-05-24 06:30:06 +02:00
parent ab31d9885f
commit d75a375538
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/bar.hpp
View File

@ -4,11 +4,18 @@
#include <string>
#include <memory>
#include "config.hpp"
#include "exception.hpp"
#include "utils/xlib.hpp"
DefineBaseException(ConfigurationError);
struct CompiledWithoutModuleSupport : public ConfigurationError
{
CompiledWithoutModuleSupport(std::string module_name)
: ConfigurationError(std::string(APP_NAME) + " was not compiled with support for module \""+ module_name +"\"") {}
};
struct Font
{
std::string id;

2
include/config.hpp.cmake
View File

@ -1,6 +1,8 @@
#ifndef _CONFIG_HPP_
#define _CONFIG_HPP_
#define APP_NAME "@PROJECT_NAME@"
#cmakedefine ENABLE_ALSA
#cmakedefine ENABLE_MPD
#cmakedefine ENABLE_NETWORK

20
src/bar.cpp
View File

@ -157,17 +157,29 @@ void Bar::load()
else if (type == "internal/cpu") module = std::make_unique<modules::CpuModule>(mod);
else if (type == "internal/date") module = std::make_unique<modules::DateModule>(mod);
else if (type == "internal/memory") module = std::make_unique<modules::MemoryModule>(mod);
else if (type == "internal/network")
#ifdef ENABLE_NETWORK
else if (type == "internal/network") module = std::make_unique<modules::NetworkModule>(mod);
module = std::make_unique<modules::NetworkModule>(mod);
#else
throw CompiledWithoutModuleSupport("network");
#endif
else if (type == "internal/i3")
#ifdef ENABLE_I3
else if (type == "internal/i3") module = std::make_unique<modules::i3Module>(mod, this->opts->monitor->name);
module = std::make_unique<modules::i3Module>(mod, this->opts->monitor->name);
#else
throw CompiledWithoutModuleSupport("i3");
#endif
else if (type == "internal/mpd")
#ifdef ENABLE_MPD
else if (type == "internal/mpd") module = std::make_unique<modules::MpdModule>(mod);
module = std::make_unique<modules::MpdModule>(mod);
#else
throw CompiledWithoutModuleSupport("mpd");
#endif
else if (type == "internal/volume")
#ifdef ENABLE_ALSA
else if (type == "internal/volume") module = std::make_unique<modules::VolumeModule>(mod);
module = std::make_unique<modules::VolumeModule>(mod);
#else
throw CompiledWithoutModuleSupport("volume");
#endif
#if 0
else if (type == "internal/rtorrent") module = std::make_unique<modules::TorrentModule>(mod);