blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3494 from yangyingchao/master 

fix #3490: expand menu file before opening it
This commit is contained in:
Alexis Rouillard 2024-08-05 09:51:35 +02:00 committed by GitHub
parent 4ae144a724 7ec1343ad5
commit 79d3a1a296
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/config.hpp
View File

@ -20,6 +20,9 @@ class Config {
static std::optional<std::string> findConfigPath(
const std::vector<std::string> &names, const std::vector<std::string> &dirs = CONFIG_DIRS);
static std::optional<std::string> tryExpandPath(const std::string &base,
const std::string &filename);
Config() = default;
void load(const std::string &config);

12
src/ALabel.cpp
View File

@ -6,6 +6,8 @@
#include <iostream>
#include <util/command.hpp>
#include "config.hpp"
namespace waybar {
ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id,
@ -61,6 +63,14 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
try {
// Check that the file exists
std::string menuFile = config_["menu-file"].asString();
// there might be "~" or "$HOME" in original path, try to expand it.
auto result = Config::tryExpandPath(menuFile, "");
if (!result.has_value()) {
throw std::runtime_error("Failed to expand file: " + menuFile);
}
menuFile = result.value();
// Read the menu descriptor file
std::ifstream file(menuFile);
if (!file.is_open()) {
@ -170,7 +180,7 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
return AModule::handleToggle(e);
}
void ALabel::handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data) {
void ALabel::handleGtkMenuEvent(GtkMenuItem* /*menuitem*/, gpointer data) {
waybar::util::command::res res = waybar::util::command::exec((char*)data, "GtkMenu");
}

3
src/config.cpp
View File

@ -21,7 +21,8 @@ const std::vector<std::string> Config::CONFIG_DIRS = {
const char *Config::CONFIG_PATH_ENV = "WAYBAR_CONFIG_DIR";
std::optional<std::string> tryExpandPath(const std::string &base, const std::string &filename) {
std::optional<std::string> Config::tryExpandPath(const std::string &base,
const std::string &filename) {
fs::path path;
if (!filename.empty()) {