Compare commits

..

5 Commits

Author SHA1 Message Date
ce0643b6ac quick commit 2026-02-04 15:52:31 +01:00
0463c37543 nice control center 2026-02-03 23:03:20 +01:00
cddcc96aa9 media widget fix 2026-02-03 22:12:45 +01:00
a048d7ae7a quick commit 2026-02-03 18:47:54 +01:00
b9f5eea4af mpris mostly works, still need to init the state though 2026-02-03 11:22:57 +01:00
36 changed files with 1886 additions and 332 deletions

View File

@@ -38,20 +38,24 @@ target_sources(bar_lib
src/app.cpp
src/bar/bar.cpp
src/connection/httpConnection.cpp
src/connection/dbus/notification.cpp
src/connection/dbus/mpris.cpp
src/connection/dbus/tray.cpp
src/widgets/clock.cpp
src/widgets/date.cpp
src/widgets/notification/baseNotification.cpp
src/widgets/notification/copyNotification.cpp
src/widgets/notification/notificationWindow.cpp
src/widgets/notification/spotifyNotification.cpp
src/widgets/volumeWidget.cpp
src/widgets/weather.cpp
src/widgets/webWidget.cpp
src/services/hyprland.cpp
src/services/notificationController.cpp
src/services/textureCache.cpp
src/services/tray.cpp
src/services/dbus/notification.cpp
src/services/dbus/mpris.cpp
src/widgets/tray.cpp
src/widgets/controlCenter/controlCenter.cpp

View File

@@ -4,7 +4,8 @@
#include "bar/bar.hpp"
#include "services/hyprland.hpp"
#include "services/dbus/notification.hpp"
#include "connection/dbus/notification.hpp"
#include "connection/dbus/tray.hpp"
#include "glibmm/refptr.h"
#include "gtkmm/application.h"

View File

@@ -27,8 +27,8 @@ class Bar : public Gtk::Window {
Clock clock;
Date date;
WebWidget homeAssistant{"\ue88a", "Home Assistant", "https://home.rivercry.com"};
ControlCenter controlCenter{"\ue88a", "Control Center"};
WebWidget homeAssistant{"\uf024", "Home Assistant", "https://home.rivercry.com"};
ControlCenter controlCenter{"\ue062", "Control Center"};
std::shared_ptr<TrayWidget> trayWidget = nullptr;
std::shared_ptr<VolumeWidget> volumeWidget = nullptr;

View File

@@ -12,7 +12,7 @@ class Popover : public Button {
protected:
void on_toggle_window();
Gtk::Popover *popover = nullptr;
std::unique_ptr<Gtk::Popover> popover;
void set_popover_child(Gtk::Widget &child) {
gtk_popover_set_child(popover->gobj(), child.gobj());
}

View File

@@ -0,0 +1,24 @@
#pragma once
#include <giomm.h>
#include <sigc++/sigc++.h>
class DbusConnection {
public:
virtual ~DbusConnection() = default;
protected:
Glib::RefPtr<Gio::DBus::Connection> connection;
void connect_session_async(const sigc::slot<void(const Glib::RefPtr<Gio::AsyncResult> &)> &callback) {
Gio::DBus::Connection::get(Gio::DBus::BusType::SESSION, callback);
}
static void ensure_gio_init() {
try {
Gio::init();
} catch (const Glib::Error &) {
// Already initialized.
}
}
};

View File

@@ -10,12 +10,11 @@
#include "gdkmm/pixbuf.h"
#include "glibmm/variant.h"
struct MprisPlayer2Message {
std::string title;
std::vector<std::string> artist;
std::string artwork_url;
std::string track_id;
int64_t length_ms;
std::function<void()> play_pause;

View File

@@ -3,10 +3,12 @@
#include <cstdint>
#include <giomm.h>
#include <sigc++/sigc++.h>
#include <set>
#include <vector>
#include "services/dbus/messages.hpp"
#include "connection/dbus/dbus.hpp"
#include "connection/dbus/messages.hpp"
class MprisController {
class MprisController : public DbusConnection {
public:
struct PlayerState {
std::string title;
@@ -21,18 +23,27 @@ class MprisController {
};
static std::shared_ptr<MprisController> getInstance();
static std::shared_ptr<MprisController> createForPlayer(const std::string &bus_name);
std::vector<std::string> get_registered_players() const;
void toggle_play();
void pause();
void next_song();
void previous_song();
void emit_seeked(int64_t position_us);
void set_position(const std::string &track_id, int64_t position_us);
sigc::signal<void(const MprisPlayer2Message &)> &signal_mpris_updated();
sigc::signal<void(PlaybackStatus)> &signal_playback_status_changed();
sigc::signal<void(int64_t)> &signal_playback_position_changed();
sigc::signal<void(bool)> &signal_can_seek_changed();
sigc::signal<void(const std::string &)> &signal_player_registered();
sigc::signal<void(const std::string &)> &signal_player_deregistered();
private:
MprisController();
explicit MprisController(const std::string &bus_name);
std::map<std::string, PlaybackStatus> playbackStatusMap = {
{"Playing", PlaybackStatus::Playing},
{"Paused", PlaybackStatus::Paused},
@@ -41,15 +52,28 @@ class MprisController {
PlaybackStatus currentPlaybackStatus = PlaybackStatus::Stopped;
Glib::RefPtr<Gio::DBus::Connection> m_connection;
Glib::RefPtr<Gio::DBus::Proxy> m_proxy;
Glib::RefPtr<Gio::DBus::Proxy> m_dbus_proxy;
std::string m_player_bus_name = "org.mpris.MediaPlayer2.spotify";
std::set<std::string> registeredPlayers;
sigc::signal<void(const MprisPlayer2Message &)> mprisUpdatedSignal;
sigc::signal<void(PlaybackStatus)> playbackStatusChangedSignal;
sigc::signal<void(int64_t)> playbackPositionChangedSignal;
sigc::signal<void(bool)> canSeekChangedSignal;
sigc::signal<void(const std::string &)> playerRegisteredSignal;
sigc::signal<void(const std::string &)> playerDeregisteredSignal;
void on_bus_connected(const Glib::RefPtr<Gio::AsyncResult> &result);
void signalNotification();
void emit_cached_playback_status();
void emit_cached_position();
void emit_cached_can_seek();
void on_dbus_signal(const Glib::ustring &sender_name,
const Glib::ustring &signal_name,
const Glib::VariantContainerBase &parameters);
void handle_player_registered(const std::string &bus_name);
void handle_player_deregistered(const std::string &bus_name);
// Called when the song changes
void on_properties_changed(const Gio::DBus::Proxy::MapChangedProperties &changed_properties,

View File

@@ -5,6 +5,7 @@
#include <gtkmm.h>
#include <sigc++/sigc++.h>
#include "connection/dbus/dbus.hpp"
#include "giomm/dbusconnection.h"
#include "giomm/dbusownname.h"
#include "glib.h"
@@ -39,7 +40,7 @@ const Glib::ustring introspection_xml = R"(
</node>
)";
class NotificationService {
class NotificationService : public DbusConnection {
public:
NotificationService() : notificationIdCounter(1) {
Gio::DBus::own_name(

View File

@@ -15,7 +15,9 @@
#include <string>
#include <vector>
class TrayService {
#include "connection/dbus/dbus.hpp"
class TrayService : public DbusConnection {
inline static TrayService *instance = nullptr;
public:
struct Item {
@@ -85,7 +87,6 @@ class TrayService {
bool addSignalPending = false;
};
Glib::RefPtr<Gio::DBus::Connection> connection;
Glib::RefPtr<Gio::DBus::NodeInfo> nodeInfo;
Gio::DBus::InterfaceVTable vtable;

View File

@@ -0,0 +1,36 @@
#pragma once
#include <map>
#include <string>
struct HttpResponse {
long status_code = 0;
std::string body;
std::map<std::string, std::string> headers;
std::string error;
bool ok() const {
return error.empty();
}
};
class HttpConnection {
public:
static HttpResponse get(const std::string &url,
const std::map<std::string, std::string> &headers = {},
long timeout_ms = 0);
static HttpResponse post(const std::string &url,
const std::string &body,
const std::map<std::string, std::string> &headers = {},
const std::string &content_type = "application/json",
long timeout_ms = 0);
private:
static HttpResponse performRequest(const std::string &method,
const std::string &url,
const std::string &body,
const std::map<std::string, std::string> &headers,
const std::string &content_type,
long timeout_ms);
};

View File

@@ -6,7 +6,7 @@
#include <sys/types.h>
#include <vector>
#include "services/dbus/messages.hpp"
#include "connection/dbus/messages.hpp"
#include "widgets/notification/baseNotification.hpp"
#include "gdkmm/monitor.h"
@@ -24,6 +24,7 @@ class NotificationController {
void showSpotifyNotification(MprisPlayer2Message mpris);
void showNotificationOnAllMonitors(NotifyMessage notify);
void showCopyNotification(NotifyMessage notify);
private:
uint64_t globalNotificationId = 1;

View File

@@ -2,7 +2,13 @@
#include "components/popover.hpp"
#include "gtkmm/box.h"
#include "gtkmm/button.h"
#include "gtkmm/label.h"
#include "gtkmm/stack.h"
#include "widgets/controlCenter/mediaControl.hpp"
#include "widgets/weather.hpp"
#include <unordered_map>
class ControlCenter : public Popover {
public:
@@ -10,6 +16,17 @@ class ControlCenter : public Popover {
private:
Gtk::Box container;
MediaControlWidget mediaControlWidget;
Gtk::Box tabRow;
Gtk::Stack contentStack;
Gtk::Box controlCenterContainer;
WeatherWidget weatherWidget;
Gtk::Button mediaControl;
Gtk::Button testTabButton;
std::shared_ptr<MprisController> mprisController = MprisController::getInstance();
std::unordered_map<std::string, MediaControlWidget*> mediaWidgets;
void addPlayerWidget(const std::string &bus_name);
void removePlayerWidget(const std::string &bus_name);
void setActiveTab(const std::string &tab_name);
};

View File

@@ -7,23 +7,29 @@
#include "gtkmm/scale.h"
#include "gtkmm/scrolledwindow.h"
#include "services/dbus/mpris.hpp"
#include "connection/dbus/mpris.hpp"
class MediaControlWidget : public Gtk::Box {
public:
MediaControlWidget();
explicit MediaControlWidget(std::shared_ptr<MprisController> controller);
private:
std::shared_ptr<MprisController> mprisController = MprisController::getInstance();
std::shared_ptr<MprisController> mprisController;
int64_t currentPositionUs = 0;
int64_t totalLengthUs = 0;
sigc::connection seekTimerConnection;
bool suppressSeekSignal = false;
std::string currentTrackId;
MprisController::PlaybackStatus playbackStatus = MprisController::PlaybackStatus::Stopped;
bool canSeek = true;
void setCurrentPosition(int64_t position_us);
void setTotalLength(int64_t length_us);
void resetSeekTimer(int64_t start_position_us);
bool onSeekTick();
void schedulePauseAfterSeek();
void setCanSeek(bool can_seek);
Gtk::Box spotifyContainer;

View File

@@ -1,20 +1,19 @@
#pragma once
#include <chrono>
#include <csignal>
#include <cstdint>
#include <chrono>
#include <sigc++/connection.h>
#include "gdkmm/monitor.h"
#include "gtkmm/scrolledwindow.h"
#include "gtkmm/window.h"
#define DEFAULT_NOTIFICATION_TIMEOUT 5000
#define DEFAULT_NOTIFICATION_TIMEOUT 6700
class BaseNotification : public Gtk::Window {
public:
BaseNotification( uint64_t notificationId, std::shared_ptr<Gdk::Monitor> monitor);
BaseNotification(uint64_t notificationId, std::shared_ptr<Gdk::Monitor> monitor);
void pauseAutoClose();
void resumeAutoClose();
@@ -28,6 +27,7 @@ class BaseNotification : public Gtk::Window {
uint64_t getNotificationId() const {
return this->notificationId;
}
private:
void ensure_notification_css_loaded();
@@ -38,7 +38,7 @@ class BaseNotification : public Gtk::Window {
protected:
uint64_t notificationId;
bool autoClosePaused = false;
bool autoClosePaused = false;
int autoCloseRemainingMs = 0;
std::chrono::steady_clock::time_point autoCloseDeadline;
sigc::connection autoCloseConnection;

View File

@@ -0,0 +1,34 @@
#pragma once
#include <spdlog/spdlog.h>
#include "connection/dbus/messages.hpp"
#include "widgets/notification/baseNotification.hpp"
#include "gtkmm/box.h"
class CopyNotification : public BaseNotification {
enum class CopyType {
TEXT,
IMAGE
};
public:
CopyNotification(uint64_t id,
std::shared_ptr<Gdk::Monitor> monitor,
NotifyMessage notify);
virtual ~CopyNotification() = default;
protected:
private:
CopyType type;
std::string copiedText;
Glib::RefPtr<Gdk::Pixbuf> copiedImage;
Gtk::Box mainBox;
std::string title;
void createImageNotification(NotifyMessage notify);
void createTextNotification(NotifyMessage notify);
void setupTitle(std::string title);
};

View File

@@ -2,7 +2,7 @@
#pragma once
#include <cstdint>
#include "services/dbus/messages.hpp"
#include "connection/dbus/messages.hpp"
#include "widgets/notification/baseNotification.hpp"
class NotificationWindow : public BaseNotification {

View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <memory>
#include "services/dbus/messages.hpp"
#include "connection/dbus/messages.hpp"
#include "widgets/notification/baseNotification.hpp"
#include "gtkmm/centerbox.h"

View File

@@ -17,7 +17,7 @@
#include <string>
#include <vector>
#include "services/tray.hpp"
#include "connection/dbus/tray.hpp"
#include "components/base/button.hpp"
class TrayIconWidget : public Button {

View File

@@ -0,0 +1,20 @@
#pragma once
#include <gtkmm/box.h>
#include <gtkmm/label.h>
#include <sigc++/sigc++.h>
class WeatherWidget : public Gtk::Box {
public:
WeatherWidget();
private:
Gtk::Label titleLabel;
Gtk::Label currentLabel;
Gtk::Label todayLabel;
bool onRefreshTick();
void fetchWeather();
void applyWeatherText(const std::string &current_text,
const std::string &today_text);
};

View File

@@ -21,10 +21,44 @@ window {
font-family: var(--text-font);
}
.material-icons {
font-family: var(--icon-font-material);
font-size: 18px;
}
.tab-icon {
font-family: var(--icon-font-material);
font-size: 20px;
margin-right: 6px;
border-radius: 4px;
border: 1px solid transparent;
padding: 2px 4px;
}
.tab-icon:hover {
background-color: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(255, 255, 255, 0.2);
}
.control-center-tab-row {
/* mordern and sleek */
background-color: rgba(50, 50, 50, 0.8);
border-radius: 8px;
padding: 2px 4px;
margin-bottom: 4px;
}
.active-button {
background-color: #ffffff;
color: #1e1e1e;
border-radius: 4px;
box-shadow: 0 0 6px rgba(255, 255, 255, 0.8);
}
popover {
margin-top: 4px;
font-family: var(--text-font);
padding: 6px;
/* padding: 6px; TODO: create better padding*/
border-radius: 8px;
background: rgba(25, 25, 25, 0.8);
@@ -34,17 +68,22 @@ popover {
}
.control-center-popover {
background-color: rgba(35, 35, 35, 0.95);
padding: 12px;
background-color: rgba(25, 25, 25, 0.95);
}
.control-center-spotify-container {
border: 1px solid rgba(80, 80, 80, 0.8);
padding-top : 6px;
border-radius: 8px;
background: rgba(30, 30, 30, 0.95);
box-shadow: 0 4px 30px rgba(0, 0, 0, 0.3);
border: 1px solid rgba(57, 57, 57, 0.8);
}
.control-center-spotify-artist-label {
.control-center-player-container {
border-radius: 8px;
background: rgba(35, 35, 35, 0.95);
margin-bottom: 6px;
}
.control-center-player-artist-label {
font-size: 14px;
font-weight: 600;
color: #ffffff;
@@ -55,7 +94,7 @@ popover {
text-shadow: 0 0 5px #000000aa;
}
.control-center-spotify-title-label {
.control-center-player-title-label {
font-size: 12px;
color: #cccccc;
padding: 2px 6px;
@@ -69,6 +108,7 @@ popover {
min-height: 6px;
min-width: 120px;
margin: 0 6px;
border-bottom: 1px solid var(--color-border);
}
.control-center-seek-bar trough {

View File

@@ -2,8 +2,8 @@
#include <sigc++/sigc++.h>
#include <vector>
#include "services/dbus/notification.hpp"
#include "services/dbus/mpris.hpp"
#include "connection/dbus/notification.hpp"
#include "connection/dbus/mpris.hpp"
#include "services/notificationController.hpp"
#include "services/textureCache.hpp"

View File

@@ -5,14 +5,14 @@ Popover::Popover(const std::string icon, std::string name): Button(icon) {
set_name(name);
popover = new Gtk::Popover();
this->add_css_class("material-icons");
popover = std::make_unique<Gtk::Popover>();
popover->set_parent(*this);
popover->set_autohide(true);
}
Popover::~Popover() {
delete popover;
}
Popover::~Popover() = default;
void Popover::on_toggle_window() {
if (popover->get_visible()) {

View File

View File

@@ -0,0 +1,410 @@
#include "connection/dbus/mpris.hpp"
#include <map>
#include <spdlog/spdlog.h>
#include <sys/types.h>
#include "helpers/string.hpp"
#include "giomm/dbusconnection.h"
#include "giomm/dbusproxy.h"
std::shared_ptr<MprisController> MprisController::getInstance() {
static std::shared_ptr<MprisController> instance = std::shared_ptr<MprisController>(new MprisController());
return instance;
}
std::shared_ptr<MprisController> MprisController::createForPlayer(const std::string &bus_name) {
return std::shared_ptr<MprisController>(new MprisController(bus_name));
}
MprisController::MprisController() {
connect_session_async(sigc::mem_fun(*this, &MprisController::on_bus_connected));
}
MprisController::MprisController(const std::string &bus_name)
: m_player_bus_name(bus_name) {
connect_session_async(sigc::mem_fun(*this, &MprisController::on_bus_connected));
}
std::vector<std::string> MprisController::get_registered_players() const {
return std::vector<std::string>(registeredPlayers.begin(), registeredPlayers.end());
}
sigc::signal<void(const MprisPlayer2Message &)> &MprisController::signal_mpris_updated() {
return mprisUpdatedSignal;
}
sigc::signal<void(MprisController::PlaybackStatus)> &MprisController::signal_playback_status_changed() {
return playbackStatusChangedSignal;
}
sigc::signal<void(int64_t)> &MprisController::signal_playback_position_changed() {
return playbackPositionChangedSignal;
}
sigc::signal<void(bool)> &MprisController::signal_can_seek_changed() {
return canSeekChangedSignal;
}
sigc::signal<void(const std::string &)> &MprisController::signal_player_registered() {
return playerRegisteredSignal;
}
sigc::signal<void(const std::string &)> &MprisController::signal_player_deregistered() {
return playerDeregisteredSignal;
}
void MprisController::on_bus_connected(const Glib::RefPtr<Gio::AsyncResult> &result) {
if (!result) {
spdlog::error("DBus Connection Error: null async result");
return;
}
try {
connection = Gio::DBus::Connection::get_finish(result);
if (!m_dbus_proxy) {
m_dbus_proxy = Gio::DBus::Proxy::create_sync(
connection,
"org.freedesktop.DBus",
"/org/freedesktop/DBus",
"org.freedesktop.DBus");
if (m_dbus_proxy) {
m_dbus_proxy->signal_signal().connect(
sigc::mem_fun(*this, &MprisController::on_dbus_signal));
try {
auto list_names_result = m_dbus_proxy->call_sync("ListNames");
auto names_variant = Glib::VariantBase::cast_dynamic<
Glib::Variant<std::vector<Glib::ustring>>>(list_names_result.get_child(0));
for (const auto &name : names_variant.get()) {
const std::string bus_name = name;
if (bus_name.rfind("org.mpris.MediaPlayer2.", 0) == 0) {
handle_player_registered(bus_name);
}
}
} catch (const Glib::Error &ex) {
spdlog::error("DBus ListNames Error: {}", ex.what());
}
}
}
} catch (const Glib::Error &ex) {
spdlog::error("DBus Connection Error: {}", ex.what());
}
}
void MprisController::on_dbus_signal(const Glib::ustring &,
const Glib::ustring &signal_name,
const Glib::VariantContainerBase &parameters) {
if (signal_name != "NameOwnerChanged") {
return;
}
auto name_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(parameters.get_child(0));
auto old_owner_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(parameters.get_child(1));
auto new_owner_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(parameters.get_child(2));
const std::string bus_name = name_var.get();
if (bus_name.rfind("org.mpris.MediaPlayer2.", 0) != 0) {
return;
}
const bool had_owner = !old_owner_var.get().empty();
const bool has_owner = !new_owner_var.get().empty();
if (!had_owner && has_owner) {
handle_player_registered(bus_name);
} else if (had_owner && !has_owner) {
handle_player_deregistered(bus_name);
}
}
void MprisController::handle_player_registered(const std::string &bus_name) {
spdlog::info("MPRIS player registered: {}", bus_name);
registeredPlayers.insert(bus_name);
if (bus_name == m_player_bus_name && !m_proxy && connection) {
try {
m_proxy = Gio::DBus::Proxy::create_sync(
connection,
m_player_bus_name,
"/org/mpris/MediaPlayer2",
"org.mpris.MediaPlayer2.Player");
if (m_proxy) {
m_proxy->signal_properties_changed().connect(
sigc::mem_fun(*this, &MprisController::on_properties_changed));
signalNotification();
emit_cached_playback_status();
emit_cached_position();
emit_cached_can_seek();
}
} catch (const Glib::Error &ex) {
spdlog::error("DBus Connection Error: {}", ex.what());
}
}
playerRegisteredSignal.emit(bus_name);
}
void MprisController::handle_player_deregistered(const std::string &bus_name) {
spdlog::info("MPRIS player deregistered: {}", bus_name);
registeredPlayers.erase(bus_name);
if (bus_name == m_player_bus_name) {
m_proxy.reset();
}
playerDeregisteredSignal.emit(bus_name);
}
void MprisController::signalNotification() {
if (!m_proxy) {
return;
}
Glib::VariantBase metadata_var;
m_proxy->get_cached_property(metadata_var, "Metadata");
if (!metadata_var) {
spdlog::info("No metadata available.");
return;
}
if (!metadata_var.is_of_type(Glib::VariantType("a{sv}"))) {
spdlog::error("Unexpected metadata type.");
return;
}
using MetadataMap = std::map<Glib::ustring, Glib::VariantBase>;
MetadataMap metadata_map;
Glib::Variant<MetadataMap> variant_dict =
Glib::VariantBase::cast_dynamic<Glib::Variant<MetadataMap>>(metadata_var);
metadata_map = variant_dict.get();
std::string title, artwork_url, track_id;
std::vector<std::string> artist;
if (metadata_map.count("xesam:title")) {
const auto &title_base = metadata_map["xesam:title"];
if (title_base.is_of_type(Glib::VariantType("s"))) {
auto title_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(title_base);
title = title_var.get();
}
}
if (metadata_map.count("xesam:artist")) {
const auto &artist_var = metadata_map["xesam:artist"];
if (artist_var.is_of_type(Glib::VariantType("as"))) {
auto artists = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<Glib::ustring>>>(artist_var).get();
if (!artists.empty()) {
for (const auto &a : artists) {
artist.push_back(a);
}
}
} else if (artist_var.is_of_type(Glib::VariantType("s"))) {
auto artist_str = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(artist_var);
artist.push_back(artist_str.get());
}
}
if (metadata_map.count("mpris:artUrl")) {
const auto &art_base = metadata_map["mpris:artUrl"];
if (art_base.is_of_type(Glib::VariantType("s"))) {
auto art_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(art_base);
artwork_url = art_var.get();
}
}
if (metadata_map.count("mpris:trackid")) {
const auto &track_base = metadata_map["mpris:trackid"];
if (track_base.is_of_type(Glib::VariantType("o"))) {
auto track_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(track_base);
track_id = track_var.get();
} else if (track_base.is_of_type(Glib::VariantType("s"))) {
auto track_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(track_base);
track_id = track_var.get();
}
}
int64_t length_us = 0;
if (metadata_map.count("mpris:length")) {
const auto &length_base = metadata_map["mpris:length"];
if (length_base.is_of_type(Glib::VariantType("x"))) {
auto length_var = Glib::VariantBase::cast_dynamic<Glib::Variant<gint64>>(length_base);
length_us = static_cast<int64_t>(length_var.get());
} else if (length_base.is_of_type(Glib::VariantType("t"))) {
auto length_var = Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(length_base);
length_us = static_cast<int64_t>(length_var.get());
}
}
MprisPlayer2Message mpris;
mpris.title = StringHelper::trimToSize(title, 30);
mpris.artist = artist;
mpris.artwork_url = artwork_url;
mpris.track_id = track_id;
mpris.play_pause = [this]() { this->toggle_play(); };
mpris.next = [this]() { this->next_song(); };
mpris.previous = [this]() { this->previous_song(); };
mpris.length_ms = length_us / 1000; // Convert microseconds to milliseconds
mprisUpdatedSignal.emit(mpris);
}
void MprisController::emit_cached_playback_status() {
if (!m_proxy) {
return;
}
Glib::VariantBase status_var;
m_proxy->get_cached_property(status_var, "PlaybackStatus");
if (!status_var || !status_var.is_of_type(Glib::VariantType("s"))) {
return;
}
auto status = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(status_var).get();
auto parsedStatusIt = playbackStatusMap.find(static_cast<std::string>(status));
if (parsedStatusIt != playbackStatusMap.end()) {
currentPlaybackStatus = parsedStatusIt->second;
playbackStatusChangedSignal.emit(currentPlaybackStatus);
} else {
spdlog::error("Unknown playback status: {}", status.raw());
}
}
void MprisController::emit_cached_position() {
if (!m_proxy) {
return;
}
Glib::VariantBase position_var;
m_proxy->get_cached_property(position_var, "Position");
if (!position_var || !position_var.is_of_type(Glib::VariantType("x"))) {
return;
}
auto position = Glib::VariantBase::cast_dynamic<Glib::Variant<gint64>>(position_var).get();
playbackPositionChangedSignal.emit(static_cast<int64_t>(position));
}
void MprisController::emit_cached_can_seek() {
if (!m_proxy) {
return;
}
Glib::VariantBase can_seek_var;
m_proxy->get_cached_property(can_seek_var, "CanSeek");
if (!can_seek_var || !can_seek_var.is_of_type(Glib::VariantType("b"))) {
return;
}
auto can_seek = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(can_seek_var).get();
canSeekChangedSignal.emit(can_seek);
}
void MprisController::on_properties_changed(const Gio::DBus::Proxy::MapChangedProperties &changed_properties,
const std::vector<Glib::ustring> &) {
if (changed_properties.find("Metadata") != changed_properties.end()) {
signalNotification();
}
if (changed_properties.find("PlaybackStatus") != changed_properties.end()) {
auto status_var = changed_properties.at("PlaybackStatus");
if (status_var.is_of_type(Glib::VariantType("s"))) {
auto status = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(status_var).get();
spdlog::info("Playback Status changed to: {}", status.raw());
auto parsedStatusIt = playbackStatusMap.find(static_cast<std::string>(status));
if (parsedStatusIt != playbackStatusMap.end()) {
currentPlaybackStatus = parsedStatusIt->second;
playbackStatusChangedSignal.emit(currentPlaybackStatus);
} else {
spdlog::error("Unknown playback status: {}", status.raw());
}
}
}
if (changed_properties.find("Position") != changed_properties.end()) {
auto position_var = changed_properties.at("Position");
if (position_var.is_of_type(Glib::VariantType("x"))) {
auto position = Glib::VariantBase::cast_dynamic<Glib::Variant<gint64>>(position_var).get();
spdlog::info("Position changed to: {}", position);
playbackPositionChangedSignal.emit(static_cast<int64_t>(position));
}
}
if (changed_properties.find("CanSeek") != changed_properties.end()) {
auto can_seek_var = changed_properties.at("CanSeek");
if (can_seek_var.is_of_type(Glib::VariantType("b"))) {
auto can_seek = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(can_seek_var).get();
canSeekChangedSignal.emit(can_seek);
}
}
}
void MprisController::previous_song() {
if (m_proxy) {
m_proxy->call("Previous");
}
}
void MprisController::toggle_play() {
if (m_proxy) {
m_proxy->call("PlayPause");
}
}
void MprisController::pause() {
if (m_proxy) {
m_proxy->call("Pause");
}
}
void MprisController::next_song() {
if (m_proxy) {
m_proxy->call("Next");
}
}
void MprisController::emit_seeked(int64_t position_us) {
spdlog::debug("Seeking to position: {}", position_us);
if (!m_proxy) {
return;
}
try {
Glib::VariantContainerBase params = Glib::VariantContainerBase::create_tuple(
Glib::Variant<gint64>::create(position_us));
m_proxy->call("Seek", params);
} catch (const Glib::Error &ex) {
spdlog::error("Error seeking: {}", ex.what());
}
}
void MprisController::set_position(const std::string &track_id, int64_t position_us) {
if (!m_proxy || track_id.empty()) {
return;
}
try {
Glib::VariantContainerBase params = Glib::VariantContainerBase::create_tuple({
Glib::Variant<Glib::DBusObjectPathString>::create(track_id),
Glib::Variant<gint64>::create(position_us)
});
m_proxy->call("SetPosition", params);
} catch (const Glib::Error &ex) {
spdlog::error("Error setting position: {}", ex.what());
}
}

View File

@@ -1,9 +1,8 @@
#include "services/dbus/notification.hpp"
#include "connection/dbus/notification.hpp"
#include <spdlog/spdlog.h>
#include <sys/types.h>
#include "helpers/string.hpp"
#include "services/notificationController.hpp"
#include "glib.h"
@@ -39,8 +38,7 @@ void NotificationService::on_method_call(const Glib::RefPtr<Gio::DBus::Connectio
handle_notify(parameters, invocation);
} else if (method_name == "GetCapabilities") {
auto caps = std::vector<Glib::ustring>{
"body", "actions", "actions-icons", "persistence", "icon-static"
};
"body", "actions", "actions-icons", "persistence", "icon-static"};
invocation->return_value(Glib::VariantContainerBase::create_tuple(
Glib::Variant<std::vector<Glib::ustring>>::create(caps)));
} else if (method_name == "GetServerInformation") {
@@ -67,45 +65,44 @@ void NotificationService::handle_notify(const Glib::VariantContainerBase &parame
parameters.get_child(hints_var, 6);
parameters.get_child(timeout_var, 7);
Glib::ustring app_name = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(app_name_var).get();
guint32 replaces_id = Glib::VariantBase::cast_dynamic<Glib::Variant<guint32>>(replaces_id_var).get();
Glib::ustring app_icon = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(app_icon_var).get();
Glib::ustring summary = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(summary_var).get();
Glib::ustring body = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(body_var).get();
std::vector<Glib::ustring> actions = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<Glib::ustring>>>(actions_var).get();
Glib::ustring app_name = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(app_name_var).get();
guint32 replaces_id = Glib::VariantBase::cast_dynamic<Glib::Variant<guint32>>(replaces_id_var).get();
Glib::ustring app_icon = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(app_icon_var).get();
Glib::ustring summary = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(summary_var).get();
Glib::ustring body = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(body_var).get();
std::vector<Glib::ustring> actions = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<Glib::ustring>>>(actions_var).get();
std::map<Glib::ustring, Glib::VariantBase> hints = Glib::VariantBase::cast_dynamic<Glib::Variant<std::map<Glib::ustring, Glib::VariantBase>>>(hints_var).get();
gint32 expire_timeout = Glib::VariantBase::cast_dynamic<Glib::Variant<gint32>>(timeout_var).get();
gint32 expire_timeout = Glib::VariantBase::cast_dynamic<Glib::Variant<gint32>>(timeout_var).get();
spdlog::info("Notification Received: {} - {}", summary.raw(), body.raw());
NotifyMessage notify;
notify.app_name = app_name;
notify.replaces_id = replaces_id;
notify.app_icon = app_icon;
notify.summary = static_cast<std::string>(summary);
notify.body = static_cast<std::string>(body);
notify.app_name = app_name;
notify.replaces_id = replaces_id;
notify.app_icon = app_icon;
notify.summary = static_cast<std::string>(summary);
notify.body = static_cast<std::string>(body);
notify.actionInvoked = std::make_shared<bool>(false);
std::vector<std::string> actions_converted;
actions_converted.reserve(actions.size());
for (ulong i = 0; i < actions.size(); i += 2) {
auto name = static_cast<std::string>(actions[i]);
auto name = static_cast<std::string>(actions[i]);
auto label = static_cast<std::string>(actions[i + 1]);
if (name == "default") {
label = "Open";
}
actions_converted.push_back(name);
actions_converted.push_back(label);
}
notify.actions = actions_converted;
for (const auto &[key, value] : hints) {
if (key == "urgency") {
if (value.is_of_type(Glib::VariantType("y"))) {
auto urgency = Glib::VariantBase::cast_dynamic<Glib::Variant<guint8>>(value).get();
auto urgency = Glib::VariantBase::cast_dynamic<Glib::Variant<guint8>>(value).get();
notify.urgency = static_cast<NotificationUrgency>(urgency);
}
}
@@ -142,15 +139,46 @@ void NotificationService::handle_notify(const Glib::VariantContainerBase &parame
}
}
}
}
if (key == "image-path") {
try {
auto image_path_variant = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(value);
auto image_path = static_cast<std::string>(image_path_variant.get());
try {
auto pixbuf = Gdk::Pixbuf::create_from_file(image_path);
notify.imageData = pixbuf;
} catch (const Glib::Error &e) {
spdlog::warn("Failed to load image from path {}: {}", image_path, e.what());
}
} catch (const std::bad_cast &e) {
spdlog::warn("Failed to decode image-path hint: {}", e.what());
}
}
}
notify.expire_timeout = expire_timeout;
guint id = notificationIdCounter++;
if (app_name == "image-copy" ) {
NotificationController::getInstance()->showCopyNotification(notify);
invocation->return_value(Glib::VariantContainerBase::create_tuple(
Glib::Variant<guint>::create(id)));
return;
}
if (app_name == "ocr-copy") {
NotificationController::getInstance()->showCopyNotification(notify);
invocation->return_value(Glib::VariantContainerBase::create_tuple(
Glib::Variant<guint>::create(id)));
return;
}
if (app_name == "Thunderbird") {
notify.expire_timeout = 10000; // 10 seconds for email notifications
}
guint id = notificationIdCounter++;
// Set up the callback to emit ActionInvoked on D-Bus
Glib::RefPtr<Gio::DBus::Connection> dbus_conn = invocation->get_connection();
notify.on_action = [dbus_conn, id](const std::string &action_id) {

View File

@@ -1,4 +1,4 @@
#include "services/tray.hpp"
#include "connection/dbus/tray.hpp"
#include <algorithm>
#include <cstring>
@@ -277,11 +277,7 @@ void TrayService::start() {
return;
}
try {
Gio::init();
} catch (const Glib::Error &) {
// Already initialised; ignore.
}
ensure_gio_init();
if (!nodeInfo) {
try {

View File

@@ -0,0 +1,119 @@
#include "connection/httpConnection.hpp"
#include <algorithm>
#include <cctype>
#include <curl/curl.h>
#include <string>
#include <utility>
namespace {
size_t write_to_string(void *contents, size_t size, size_t nmemb, void *userp) {
size_t total = size * nmemb;
auto *buffer = static_cast<std::string *>(userp);
buffer->append(static_cast<char *>(contents), total);
return total;
}
std::string trim(std::string value) {
auto not_space = [](unsigned char c) { return std::isspace(c) == 0; };
value.erase(value.begin(),
std::find_if(value.begin(), value.end(), not_space));
value.erase(std::find_if(value.rbegin(), value.rend(), not_space).base(),
value.end());
return value;
}
size_t header_to_map(char *buffer, size_t size, size_t nitems, void *userdata) {
size_t total = size * nitems;
auto *header_map = static_cast<std::map<std::string, std::string> *>(userdata);
std::string line(buffer, total);
auto colon = line.find(':');
if (colon != std::string::npos) {
auto key = trim(line.substr(0, colon));
auto value = trim(line.substr(colon + 1));
if (!key.empty()) {
header_map->insert_or_assign(std::move(key), std::move(value));
}
}
return total;
}
}
HttpResponse HttpConnection::get(const std::string &url,
const std::map<std::string, std::string> &headers,
long timeout_ms) {
return performRequest("GET", url, std::string(), headers, std::string(), timeout_ms);
}
HttpResponse HttpConnection::post(const std::string &url,
const std::string &body,
const std::map<std::string, std::string> &headers,
const std::string &content_type,
long timeout_ms) {
return performRequest("POST", url, body, headers, content_type, timeout_ms);
}
HttpResponse HttpConnection::performRequest(const std::string &method,
const std::string &url,
const std::string &body,
const std::map<std::string, std::string> &headers,
const std::string &content_type,
long timeout_ms) {
HttpResponse response;
CURL *curl = curl_easy_init();
if (!curl) {
response.error = "curl_easy_init failed";
return response;
}
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_to_string);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response.body);
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_to_map);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, &response.headers);
curl_easy_setopt(curl, CURLOPT_USERAGENT, "bar/1.0");
if (timeout_ms > 0) {
curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, timeout_ms);
}
if (method == "POST") {
curl_easy_setopt(curl, CURLOPT_POST, 1L);
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, static_cast<long>(body.size()));
} else {
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
}
struct curl_slist *header_list = nullptr;
for (const auto &pair : headers) {
std::string header = pair.first + ": " + pair.second;
header_list = curl_slist_append(header_list, header.c_str());
}
if (method == "POST" && !content_type.empty()) {
std::string content_header = "Content-Type: " + content_type;
header_list = curl_slist_append(header_list, content_header.c_str());
}
if (header_list) {
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header_list);
}
auto result = curl_easy_perform(curl);
if (result != CURLE_OK) {
response.error = curl_easy_strerror(result);
}
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response.status_code);
if (header_list) {
curl_slist_free_all(header_list);
}
curl_easy_cleanup(curl);
return response;
}

View File

@@ -1,214 +0,0 @@
#include "services/dbus/mpris.hpp"
#include <map>
#include <spdlog/spdlog.h>
#include <sys/types.h>
#include "helpers/string.hpp"
#include "giomm/dbusconnection.h"
#include "giomm/dbusproxy.h"
std::shared_ptr<MprisController> MprisController::getInstance() {
static std::shared_ptr<MprisController> instance = std::shared_ptr<MprisController>(new MprisController());
return instance;
}
MprisController::MprisController() {
Gio::DBus::Connection::get(
Gio::DBus::BusType::SESSION,
sigc::mem_fun(*this, &MprisController::on_bus_connected));
}
sigc::signal<void(const MprisPlayer2Message &)> &MprisController::signal_mpris_updated() {
return mprisUpdatedSignal;
}
sigc::signal<void(MprisController::PlaybackStatus)> &MprisController::signal_playback_status_changed() {
return playbackStatusChangedSignal;
}
sigc::signal<void(int64_t)> &MprisController::signal_playback_position_changed() {
return playbackPositionChangedSignal;
}
void MprisController::on_bus_connected(const Glib::RefPtr<Gio::AsyncResult> &result) {
if (!result) {
spdlog::error("DBus Connection Error: null async result");
return;
}
try {
m_connection = Gio::DBus::Connection::get_finish(result);
std::string player_bus_name = "org.mpris.MediaPlayer2.spotify";
m_proxy = Gio::DBus::Proxy::create_sync(
m_connection,
player_bus_name, // The Bus Name
"/org/mpris/MediaPlayer2", // The Object Path
"org.mpris.MediaPlayer2.Player" // The Interface
);
if (m_proxy) {
spdlog::info("Connected to: {}", player_bus_name);
signalNotification();
m_proxy->signal_properties_changed().connect(
sigc::mem_fun(*this, &MprisController::on_properties_changed));
}
} catch (const Glib::Error &ex) {
spdlog::error("DBus Connection Error: {}", ex.what());
}
}
void MprisController::signalNotification() {
if (!m_proxy) {
return;
}
Glib::VariantBase metadata_var;
m_proxy->get_cached_property(metadata_var, "Metadata");
if (!metadata_var) {
spdlog::info("No metadata available.");
return;
}
if (!metadata_var.is_of_type(Glib::VariantType("a{sv}"))) {
spdlog::error("Unexpected metadata type.");
return;
}
using MetadataMap = std::map<Glib::ustring, Glib::VariantBase>;
MetadataMap metadata_map;
Glib::Variant<MetadataMap> variant_dict =
Glib::VariantBase::cast_dynamic<Glib::Variant<MetadataMap>>(metadata_var);
metadata_map = variant_dict.get();
std::string title, artwork_url;
std::vector<std::string> artist;
if (metadata_map.count("xesam:title")) {
const auto &title_base = metadata_map["xesam:title"];
if (title_base.is_of_type(Glib::VariantType("s"))) {
auto title_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(title_base);
title = title_var.get();
}
}
if (metadata_map.count("xesam:artist")) {
const auto &artist_var = metadata_map["xesam:artist"];
if (artist_var.is_of_type(Glib::VariantType("as"))) {
auto artists = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<Glib::ustring>>>(artist_var).get();
if (!artists.empty()) {
for (const auto &a : artists) {
artist.push_back(a);
}
}
} else if (artist_var.is_of_type(Glib::VariantType("s"))) {
auto artist_str = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(artist_var);
artist.push_back(artist_str.get());
}
}
if (metadata_map.count("mpris:artUrl")) {
const auto &art_base = metadata_map["mpris:artUrl"];
if (art_base.is_of_type(Glib::VariantType("s"))) {
auto art_var = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(art_base);
artwork_url = art_var.get();
}
}
int64_t length_us = 0;
if (metadata_map.count("mpris:length")) {
const auto &length_base = metadata_map["mpris:length"];
if (length_base.is_of_type(Glib::VariantType("x"))) {
auto length_var = Glib::VariantBase::cast_dynamic<Glib::Variant<gint64>>(length_base);
length_us = static_cast<int64_t>(length_var.get());
} else if (length_base.is_of_type(Glib::VariantType("t"))) {
auto length_var = Glib::VariantBase::cast_dynamic<Glib::Variant<guint64>>(length_base);
length_us = static_cast<int64_t>(length_var.get());
}
}
MprisPlayer2Message mpris;
mpris.title = StringHelper::trimToSize(title, 30);
mpris.artist = artist;
mpris.artwork_url = artwork_url;
mpris.play_pause = [this]() { this->toggle_play(); };
mpris.next = [this]() { this->next_song(); };
mpris.previous = [this]() { this->previous_song(); };
mpris.length_ms = length_us; // Convert microseconds to milliseconds
mprisUpdatedSignal.emit(mpris);
}
void MprisController::on_properties_changed(const Gio::DBus::Proxy::MapChangedProperties &changed_properties,
const std::vector<Glib::ustring> &) {
if (changed_properties.find("Metadata") != changed_properties.end()) {
signalNotification();
}
if (changed_properties.find("PlaybackStatus") != changed_properties.end()) {
auto status_var = changed_properties.at("PlaybackStatus");
if (status_var.is_of_type(Glib::VariantType("s"))) {
auto status = Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(status_var).get();
spdlog::info("Playback Status changed to: {}", status.raw());
auto parsedStatusIt = playbackStatusMap.find(static_cast<std::string>(status));
if (parsedStatusIt != playbackStatusMap.end()) {
currentPlaybackStatus = parsedStatusIt->second;
playbackStatusChangedSignal.emit(currentPlaybackStatus);
} else {
spdlog::error("Unknown playback status: {}", status.raw());
}
}
}
if (changed_properties.find("Position") != changed_properties.end()) {
auto position_var = changed_properties.at("Position");
if (position_var.is_of_type(Glib::VariantType("x"))) {
auto position = Glib::VariantBase::cast_dynamic<Glib::Variant<gint64>>(position_var).get();
spdlog::info("Position changed to: {}", position);
playbackPositionChangedSignal.emit(static_cast<int64_t>(position));
}
}
}
void MprisController::previous_song() {
if (m_proxy) {
m_proxy->call("Previous");
}
}
void MprisController::toggle_play() {
if (m_proxy) {
m_proxy->call("PlayPause");
}
}
void MprisController::next_song() {
if (m_proxy) {
m_proxy->call("Next");
}
}
void MprisController::emit_seeked(int64_t position_us) {
if (!m_proxy) {
return;
}
try {
Glib::VariantContainerBase params = Glib::VariantContainerBase::create_tuple(
Glib::Variant<gint64>::create(position_us));
m_proxy->call("Seek", params);
} catch (const Glib::Error &ex) {
spdlog::error("Error seeking: {}", ex.what());
}
}

View File

@@ -1,14 +1,14 @@
#include "services/notificationController.hpp"
#include <algorithm>
#include <memory>
#include "services/dbus/messages.hpp"
#include "connection/dbus/messages.hpp"
#include "widgets/notification/baseNotification.hpp"
#include "widgets/notification/copyNotification.hpp"
#include "widgets/notification/notificationWindow.hpp"
#include "widgets/notification/spotifyNotification.hpp"
#include <algorithm>
#include "gdkmm/display.h"
#include "sigc++/adaptors/bind.h"
@@ -37,7 +37,6 @@ NotificationController::NotificationController() {
}
}
void NotificationController::showNotificationOnAllMonitors(NotifyMessage notify) {
uint64_t id = this->globalNotificationId++;
std::vector<std::shared_ptr<BaseNotification>> notifications;
@@ -69,21 +68,41 @@ void NotificationController::showNotificationOnAllMonitors(NotifyMessage notify)
}
this->activeNotifications[id] = notifications;
}
void NotificationController::showCopyNotification(NotifyMessage notify) {
std::vector<std::shared_ptr<BaseNotification>> notifications;
uint64_t id = this->globalNotificationId++;
for (const auto &monitor : this->activeMonitors) {
auto notification = std::make_shared<CopyNotification>(id, monitor, notify);
notification->show();
notifications.push_back(notification);
notification->signal_close.connect([this, id = notification->getNotificationId()](int) {
closeNotification(id);
});
notification->signal_hover_changed.connect([this, id = notification->getNotificationId()](bool hovered) {
updateHoverState(id, hovered);
});
notification->startAutoClose(DEFAULT_NOTIFICATION_TIMEOUT);
}
this->activeNotifications[id] = notifications;
}
void NotificationController::showSpotifyNotification(MprisPlayer2Message mpris) {
std::vector<std::shared_ptr<BaseNotification>> notifications;
uint64_t id = this->globalNotificationId++;
for (const auto &monitor : this->activeMonitors) {
auto notification = std::make_shared<SpotifyNotification>(id, monitor, mpris);
notification->show();
notifications.push_back(notification);
notification->signal_close.connect([this, id = notification->getNotificationId()](int) {
closeNotification(id);
});
@@ -92,12 +111,10 @@ void NotificationController::showSpotifyNotification(MprisPlayer2Message mpris)
updateHoverState(id, hovered);
});
notification->startAutoClose(DEFAULT_NOTIFICATION_TIMEOUT);
notification->startAutoClose(DEFAULT_NOTIFICATION_TIMEOUT);
}
this->activeNotifications[id] = notifications;
}
void NotificationController::updateHoverState(uint64_t notificationId, bool isHovered) {

View File

@@ -5,16 +5,97 @@ ControlCenter::ControlCenter(std::string icon, std::string name)
: Popover(icon, name) {
this->popover->add_css_class("control-center-popover");
this->container.set_orientation(Gtk::Orientation::VERTICAL);
this->container.set_spacing(0);
this->container.set_margin_top(0);
this->container.set_margin_bottom(0);
this->container.set_margin_start(0);
this->container.set_margin_end(0);
this->container.set_spacing(10);
this->popover->set_hexpand(false);
this->popover->set_size_request(240, -1);
set_popover_child(this->container);
this->tabRow.set_orientation(Gtk::Orientation::HORIZONTAL);
this->tabRow.set_spacing(4);
this->tabRow.set_margin_bottom(4);
this->tabRow.add_css_class("control-center-tab-row");
this->container.append(this->mediaControlWidget);
this->mediaControl.set_label("\uf5d3"); // control icon
this->mediaControl.add_css_class("tab-icon");
this->testTabButton.set_label("\uE5CA"); // test icon
this->testTabButton.add_css_class("tab-icon");
this->tabRow.append(this->mediaControl);
this->tabRow.append(this->testTabButton);
this->container.append(this->tabRow);
this->contentStack.set_hhomogeneous(false);
this->contentStack.set_vhomogeneous(false);
this->contentStack.set_transition_type(Gtk::StackTransitionType::CROSSFADE);
this->contentStack.set_transition_duration(150);
this->controlCenterContainer.set_orientation(Gtk::Orientation::VERTICAL);
this->controlCenterContainer.set_spacing(4);
this->contentStack.add(this->controlCenterContainer, "controls", "Controls");
this->contentStack.add(this->weatherWidget, "test", "Test");
this->contentStack.set_visible_child("controls");
this->setActiveTab("controls");
this->container.append(this->contentStack);
this->mediaControl.signal_clicked().connect([this]() {
this->setActiveTab("controls");
});
this->testTabButton.signal_clicked().connect([this]() {
this->setActiveTab("test");
});
this->mprisController->signal_player_registered().connect(
[this](const std::string &bus_name) {
this->addPlayerWidget(bus_name);
});
this->mprisController->signal_player_deregistered().connect(
[this](const std::string &bus_name) {
this->removePlayerWidget(bus_name);
});
for (const auto &bus_name : this->mprisController->get_registered_players()) {
this->addPlayerWidget(bus_name);
}
}
void ControlCenter::setActiveTab(const std::string &tab_name) {
this->contentStack.set_visible_child(tab_name);
this->mediaControl.remove_css_class("active-button");
this->testTabButton.remove_css_class("active-button");
if (tab_name == "controls") {
this->mediaControl.add_css_class("active-button");
} else if (tab_name == "test") {
this->testTabButton.add_css_class("active-button");
}
}
void ControlCenter::addPlayerWidget(const std::string &bus_name) {
if (this->mediaWidgets.find(bus_name) != this->mediaWidgets.end()) {
return;
}
auto controller = MprisController::createForPlayer(bus_name);
auto widget = Gtk::make_managed<MediaControlWidget>(controller);
this->mediaWidgets.emplace(bus_name, widget);
this->controlCenterContainer.append(*widget);
}
void ControlCenter::removePlayerWidget(const std::string &bus_name) {
auto it = this->mediaWidgets.find(bus_name);
if (it == this->mediaWidgets.end()) {
return;
}
this->controlCenterContainer.remove(*it->second);
this->mediaWidgets.erase(it);
}

View File

@@ -3,14 +3,16 @@
#include "helpers/string.hpp"
#include "services/textureCache.hpp"
MediaControlWidget::MediaControlWidget()
MediaControlWidget::MediaControlWidget(std::shared_ptr<MprisController> controller)
: Gtk::Box(Gtk::Orientation::VERTICAL) {
this->mprisController = std::move(controller);
this->set_orientation(Gtk::Orientation::VERTICAL);
this->set_size_request(200, 240);
this->set_size_request(200, -1);
this->set_hexpand(false);
this->set_vexpand(false);
this->add_css_class("control-center-spotify-container");
this->add_css_class("control-center-player-container");
this->append(this->topContainer);
this->append(this->seekBarContainer);
@@ -24,7 +26,7 @@ MediaControlWidget::MediaControlWidget()
this->topContainer.set_child(this->imageWrapper);
this->topContainer.set_size_request(200, 100);
this->topContainer.set_size_request(-1, 120);
this->topContainer.set_vexpand(false);
this->topContainer.set_hexpand(true);
@@ -45,6 +47,7 @@ MediaControlWidget::MediaControlWidget()
this->seekBarContainer.append(this->currentTimeLabel);
this->seekBarContainer.append(this->seekBar);
this->seekBarContainer.append(this->totalTimeLabel);
this->seekBarContainer.set_visible(true);
this->currentTimeLabel.set_text("0:00");
this->currentTimeLabel.set_halign(Gtk::Align::START);
@@ -54,17 +57,35 @@ MediaControlWidget::MediaControlWidget()
this->seekBar.set_value(0);
this->seekBar.set_orientation(Gtk::Orientation::HORIZONTAL);
this->seekBar.set_draw_value(false);
this->seekBar.set_size_request(120, -1);
this->seekBar.set_hexpand(true);
this->seekBar.set_halign(Gtk::Align::CENTER);
this->seekBar.add_css_class("control-center-seek-bar");
this->seekBar.signal_value_changed().connect([this]() {
if (this->suppressSeekSignal || this->totalLengthUs <= 0) {
return;
}
double fraction = this->seekBar.get_value() / 100.0;
int64_t new_position_us =
static_cast<int64_t>(fraction * static_cast<double>(this->totalLengthUs));
this->mprisController->emit_seeked(new_position_us - this->currentPositionUs); // in us
this->resetSeekTimer(new_position_us);
if (new_position_us == this->currentPositionUs) {
return;
}
if (!this->currentTrackId.empty()) {
this->mprisController->set_position(this->currentTrackId, new_position_us);
if (this->playbackStatus != MprisController::PlaybackStatus::Playing) {
this->schedulePauseAfterSeek();
}
} else if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
this->mprisController->emit_seeked(new_position_us - this->currentPositionUs); // in us
} else {
return;
}
if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
this->resetSeekTimer(new_position_us);
} else {
this->setCurrentPosition(new_position_us);
}
});
this->bottomContainer.set_orientation(Gtk::Orientation::HORIZONTAL);
@@ -79,15 +100,14 @@ MediaControlWidget::MediaControlWidget()
this->bottomContainer.append(this->nextButton);
this->previousButton.set_label("\u23EE"); // Previous track symbol
this->previousButton.add_css_class("notification-button");
this->previousButton.add_css_class("notification-icon-button");
this->previousButton.add_css_class("button");
this->previousButton.add_css_class("material-icons");
this->playPauseButton.set_label("\u23EF"); // Play/Pause symbol
this->playPauseButton.add_css_class("notification-button");
this->playPauseButton.add_css_class("notification-icon-button");
this->playPauseButton.add_css_class("button");
this->playPauseButton.add_css_class("material-icons");
this->nextButton.set_label("\u23ED"); // Next track symbol
this->nextButton.add_css_class("notification-button");
this->nextButton.add_css_class("notification-icon-button");
this->nextButton.add_css_class("button");
this->nextButton.add_css_class("material-icons");
this->previousButton.signal_clicked().connect([this]() {
this->mprisController->previous_song();
});
@@ -111,14 +131,24 @@ MediaControlWidget::MediaControlWidget()
this->setCurrentPosition(position_us);
});
this->mprisController->signal_can_seek_changed().connect(
[this](bool can_seek) {
this->setCanSeek(can_seek);
});
this->artistLabel.set_text("Artist Name");
this->artistLabel.add_css_class("control-center-spotify-artist-label");
this->artistLabel.add_css_class("control-center-player-artist-label");
this->titleLabel.set_text("Song Title");
this->titleLabel.add_css_class("control-center-spotify-title-label");
this->titleLabel.add_css_class("control-center-player-title-label");
this->resetSeekTimer(0);
}
void MediaControlWidget::setCanSeek(bool can_seek) {
this->canSeek = can_seek;
this->seekBarContainer.set_visible(can_seek);
}
void MediaControlWidget::onSpotifyMprisUpdated(const MprisPlayer2Message &message) {
std::string artistText = "Unknown Artist";
if (!message.artist.empty()) {
@@ -126,14 +156,25 @@ void MediaControlWidget::onSpotifyMprisUpdated(const MprisPlayer2Message &messag
}
this->artistLabel.set_text(artistText);
this->titleLabel.set_text(message.title);
const bool trackChanged = !this->currentTrackId.empty() && this->currentTrackId != message.track_id;
this->currentTrackId = message.track_id;
if (trackChanged) {
this->currentPositionUs = 0;
}
if (auto texture = TextureCacheService::getInstance()->getTexture(message.artwork_url)) {
this->backgroundImage.set_paintable(texture);
}
this->setTotalLength(message.length_ms);
this->setCurrentPosition(0);
this->resetSeekTimer(0);
this->setTotalLength(message.length_ms * 1000);
this->setCurrentPosition(this->currentPositionUs);
if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
this->resetSeekTimer(this->currentPositionUs);
} else if (seekTimerConnection.connected()) {
seekTimerConnection.disconnect();
}
}
void MediaControlWidget::setCurrentPosition(int64_t position_us) {
@@ -144,7 +185,9 @@ void MediaControlWidget::setCurrentPosition(int64_t position_us) {
std::to_string(minutes) + ":" + (seconds < 10 ? "0" : "") + std::to_string(seconds));
if (totalLengthUs > 0) {
double fraction = static_cast<double>(currentPositionUs) / static_cast<double>(totalLengthUs);
this->suppressSeekSignal = true;
this->seekBar.set_value(fraction * 100);
this->suppressSeekSignal = false;
}
}
@@ -168,6 +211,14 @@ void MediaControlWidget::resetSeekTimer(int64_t start_position_us) {
1000);
}
void MediaControlWidget::schedulePauseAfterSeek() {
Glib::signal_timeout().connect_once([this]() {
if (this->playbackStatus != MprisController::PlaybackStatus::Playing) {
this->mprisController->pause();
}
}, 100);
}
bool MediaControlWidget::onSeekTick() {
if (totalLengthUs <= 0) {
return true;
@@ -182,6 +233,7 @@ bool MediaControlWidget::onSeekTick() {
}
void MediaControlWidget::onRunningStateChanged(MprisController::PlaybackStatus status) {
this->playbackStatus = status;
switch (status) {
case MprisController::PlaybackStatus::Playing:
this->onPlay();
@@ -202,14 +254,14 @@ void MediaControlWidget::onPlay() {
}
void MediaControlWidget::onPause() {
this->playPauseButton.set_label("\u23EF"); // Play symbol
this->playPauseButton.set_label("\u23F5"); // Play symbol
if (seekTimerConnection.connected()) {
seekTimerConnection.disconnect();
}
}
void MediaControlWidget::onStop() {
this->playPauseButton.set_label("\u23EF"); // Play symbol
this->playPauseButton.set_label("\u23F9"); // stop symbol
if (seekTimerConnection.connected()) {
seekTimerConnection.disconnect();
}

View File

@@ -17,7 +17,7 @@
BaseNotification::BaseNotification(uint64_t notificationId, std::shared_ptr<Gdk::Monitor> monitor) {
ensure_notification_css_loaded();
set_default_size(350, -1);
set_default_size(350, 100);
gtk_layer_init_for_window(gobj());
gtk_layer_set_monitor(gobj(), monitor->gobj());
gtk_layer_set_layer(gobj(), GTK_LAYER_SHELL_LAYER_OVERLAY);
@@ -72,7 +72,7 @@ void BaseNotification::startAutoClose(int timeoutMs) {
}
autoCloseRemainingMs = timeoutMs;
autoClosePaused = false;
autoClosePaused = false;
start_auto_close_timeout(timeoutMs);
}
@@ -81,12 +81,12 @@ void BaseNotification::start_auto_close_timeout(int timeoutMs) {
autoCloseConnection.disconnect();
}
autoCloseDeadline = std::chrono::steady_clock::now() + std::chrono::milliseconds(timeoutMs);
autoCloseDeadline = std::chrono::steady_clock::now() + std::chrono::milliseconds(timeoutMs);
autoCloseConnection = Glib::signal_timeout().connect([this]() {
this->signal_close.emit(this->notificationId);
return false; // Don't repeat
},
timeoutMs);
timeoutMs);
}
void BaseNotification::pause_auto_close() {
@@ -98,10 +98,10 @@ void BaseNotification::pause_auto_close() {
autoCloseConnection.disconnect();
}
auto now = std::chrono::steady_clock::now();
auto remaining = std::chrono::duration_cast<std::chrono::milliseconds>(autoCloseDeadline - now).count();
auto now = std::chrono::steady_clock::now();
auto remaining = std::chrono::duration_cast<std::chrono::milliseconds>(autoCloseDeadline - now).count();
autoCloseRemainingMs = static_cast<int>(std::max<int64_t>(0, remaining));
autoClosePaused = true;
autoClosePaused = true;
}
void BaseNotification::resume_auto_close() {
@@ -118,7 +118,6 @@ void BaseNotification::resume_auto_close() {
start_auto_close_timeout(autoCloseRemainingMs);
}
void BaseNotification::ensure_notification_css_loaded() {
static bool loaded = false;
if (loaded) {

View File

@@ -0,0 +1,162 @@
#include "widgets/notification/copyNotification.hpp"
#include <memory>
#include <spdlog/spdlog.h>
#include "glibmm/datetime.h"
#include "glibmm/fileutils.h"
#include "glibmm/miscutils.h"
#include "gtkmm/box.h"
#include "gtkmm/button.h"
#include "gtkmm/image.h"
#include "gtkmm/label.h"
// todo refactor out later
void copyToClipboard(const std::string &text) {
auto clipboard = Gdk::Display::get_default()->get_clipboard();
clipboard->set_text(text);
}
void copyToClipboard(const Glib::RefPtr<Gdk::Pixbuf> &image) {
auto clipboard = Gdk::Display::get_default()->get_clipboard();
// Wrap the pixbuf in a Value so GTK knows how to handle it
Glib::Value<Glib::RefPtr<Gdk::Pixbuf>> value;
value.init(Glib::Value<Glib::RefPtr<Gdk::Pixbuf>>::value_type());
value.set(image);
// Create a content provider from the value
auto provider = Gdk::ContentProvider::create(value);
spdlog::info("Copying image to clipboard with content provider");
clipboard->set_content(provider);
}
void createDirectoryIfNotExists(const std::string &dirpath) {
if (!Glib::file_test(dirpath, Glib::FileTest::IS_DIR)) {
try {
g_mkdir_with_parents(dirpath.c_str(), 0755);
} catch (const Glib::Error &e) {
spdlog::error("Failed to create directory {}: {}", dirpath, e.what());
}
}
}
void saveImageToFile(const Glib::RefPtr<Gdk::Pixbuf> &image, const std::string &filepath, const std::string &filename) {
try {
createDirectoryIfNotExists(filepath);
std::string fullpath = filepath + "/" + filename;
image->save(fullpath, "png");
} catch (const Glib::Error &e) {
spdlog::error("Failed to save image to file {}: {}", filepath, e.what());
}
}
CopyNotification::CopyNotification(uint64_t id,
std::shared_ptr<Gdk::Monitor> monitor,
NotifyMessage notify)
: BaseNotification(id, monitor) {
this->set_child(this->mainBox);
this->mainBox.set_orientation(Gtk::Orientation::VERTICAL);
if (notify.imageData) {
this->createImageNotification(notify);
} else if (!notify.body.empty()) {
this->createTextNotification(notify);
} else {
spdlog::warn("CopyNotification created without valid image or text data.");
}
}
void CopyNotification::createImageNotification(NotifyMessage notify) {
this->setupTitle("image copied");
this->type = CopyType::IMAGE;
this->copiedImage = notify.imageData.value();
auto contentBox = Gtk::make_managed<Gtk::Box>();
contentBox->set_orientation(Gtk::Orientation::VERTICAL);
contentBox->set_margin(0);
auto imageWidget = Gtk::make_managed<Gtk::Image>(this->copiedImage);
contentBox->append(*imageWidget);
imageWidget->set_pixel_size(300);
auto buttonBox = Gtk::make_managed<Gtk::Box>();
buttonBox->set_spacing(10);
// material icons unicode
auto saveToClipboardLabel = Gtk::make_managed<Gtk::Label>("\uF0EA"); // content copy icon
auto saveToFileLabel = Gtk::make_managed<Gtk::Label>("\uF1C5"); // save icon
auto saveToClipboardButton = Gtk::make_managed<Gtk::Button>();
saveToClipboardButton->set_child(*saveToClipboardLabel);
saveToClipboardButton->signal_clicked().connect([this]() {
copyToClipboard(this->copiedImage);
spdlog::info("Copied image to clipboard");
this->signal_close.emit(this->notificationId);
});
saveToClipboardButton->set_tooltip_text("Copy to Clipboard");
saveToClipboardButton->add_css_class("notification-button");
saveToClipboardButton->add_css_class("notification-icon-button");
auto saveToFileButton = Gtk::make_managed<Gtk::Button>();
saveToFileButton->set_child(*saveToFileLabel);
saveToFileButton->signal_clicked().connect([this]() {
// xdg-pic/screenshot // use env
auto xdgPicturesDir = Glib::get_user_special_dir(Glib::UserDirectory::PICTURES);
auto dateStamp = Glib::DateTime::create_now_local().format("%Y%m%d_%H%M%S");
auto filepath = xdgPicturesDir + "/screenshot" ;
auto filename = dateStamp + ".png";
saveImageToFile(this->copiedImage, filepath, filename);
spdlog::info("Saved image to {}", filepath.c_str());
this->signal_close.emit(this->notificationId);
});
saveToFileButton->set_tooltip_text("Save to File");
saveToFileButton->add_css_class("notification-button");
saveToFileButton->add_css_class("notification-icon-button");
buttonBox->append(*saveToClipboardButton);
buttonBox->append(*saveToFileButton);
contentBox->append(*buttonBox);
this->mainBox.append(*contentBox);
}
void CopyNotification::createTextNotification(NotifyMessage notify) {
this->setupTitle("text copied");
this->type = CopyType::TEXT;
this->copiedText = notify.body;
auto contentBox = Gtk::make_managed<Gtk::Box>();
contentBox->set_orientation(Gtk::Orientation::VERTICAL);
auto textLabel = Gtk::make_managed<Gtk::Label>(this->copiedText);
textLabel->set_margin_bottom(10);
contentBox->append(*textLabel);
auto copyToClipboardButton = Gtk::make_managed<Gtk::Button>();
auto copyToClipboardLabel = Gtk::make_managed<Gtk::Label>("\uF0EA"); // content copy icon
copyToClipboardButton->set_child(*copyToClipboardLabel);
copyToClipboardButton->signal_clicked().connect([this]() {
copyToClipboard(this->copiedText);
this->signal_close.emit(this->notificationId);
});
copyToClipboardButton->set_tooltip_text("Copy to Clipboard");
copyToClipboardButton->add_css_class("notification-icon-button");
copyToClipboardButton->add_css_class("notification-button");
copyToClipboardButton->set_hexpand(false);
copyToClipboardButton->set_halign(Gtk::Align::START);
contentBox->append(*copyToClipboardButton);
this->mainBox.append(*contentBox);
}
void CopyNotification::setupTitle(std::string title) {
this->title = title;
auto titleLabel = Gtk::make_managed<Gtk::Label>(this->title);
titleLabel->set_margin_bottom(8);
this->mainBox.append(*titleLabel);
}

View File

@@ -33,7 +33,11 @@ SpotifyNotification::SpotifyNotification(uint64_t notificationId, std::shared_pt
title_label->set_ellipsize(Pango::EllipsizeMode::END);
auto artistLabel = Gtk::make_managed<Gtk::Label>();
artistLabel->set_text(StringHelper::trimToSize(mpris.artist[0], 30));
if (!mpris.artist.empty()) {
artistLabel->set_text(StringHelper::trimToSize(mpris.artist[0], 30));
} else {
artistLabel->set_text("Unknown Artist");
}
artistLabel->set_hexpand(true);
artistLabel->set_halign(Gtk::Align::CENTER);

112
src/widgets/weather.cpp Normal file
View File

@@ -0,0 +1,112 @@
#include "widgets/weather.hpp"
#include <curl/curl.h>
#include <glibmm/main.h>
#include <ios>
#include <nlohmann/json.hpp>
#include <spdlog/spdlog.h>
#include <sstream>
#include <thread>
namespace {
constexpr const char *kWeatherUrl =
"https://api.open-meteo.com/v1/forecast?latitude=49.0094&longitude=8.4044&daily=temperature_2m_max,temperature_2m_min,weather_code&hourly=temperature_2m,rain&current=temperature_2m&timezone=Europe%2FBerlin";
size_t write_to_buffer(void *contents, size_t size, size_t nmemb, void *userp) {
size_t total = size * nmemb;
auto *buffer = static_cast<std::string *>(userp);
buffer->append(static_cast<char *>(contents), total);
return total;
}
std::string formatTemp(double value) {
std::ostringstream ss;
ss.setf(std::ios::fixed);
ss.precision(1);
ss << value << "°C";
return ss.str();
}
} // namespace
WeatherWidget::WeatherWidget()
: Gtk::Box(Gtk::Orientation::VERTICAL) {
this->set_orientation(Gtk::Orientation::VERTICAL);
this->set_spacing(6);
this->set_margin_top(4);
this->set_margin_bottom(4);
this->set_margin_start(4);
this->set_margin_end(4);
this->titleLabel.set_text("Weather");
this->currentLabel.set_text("Now: --");
this->todayLabel.set_text("Today: -- / --");
this->append(this->titleLabel);
this->append(this->currentLabel);
this->append(this->todayLabel);
this->fetchWeather();
Glib::signal_timeout().connect_seconds(
sigc::mem_fun(*this, &WeatherWidget::onRefreshTick),
3600);
}
bool WeatherWidget::onRefreshTick() {
this->fetchWeather();
return true;
}
void WeatherWidget::fetchWeather() {
std::thread([this]() {
std::string buffer;
CURL *curl = curl_easy_init();
if (!curl) {
Glib::signal_idle().connect_once([this]() {
this->applyWeatherText("Now: --", "Today: -- / --");
});
return;
}
curl_easy_setopt(curl, CURLOPT_URL, kWeatherUrl);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_to_buffer);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
curl_easy_setopt(curl, CURLOPT_USERAGENT, "bar/1.0");
auto res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
if (res != CURLE_OK || buffer.empty()) {
Glib::signal_idle().connect_once([this]() {
this->applyWeatherText("Now: --", "Today: -- / --");
});
return;
}
try {
auto json = nlohmann::json::parse(buffer);
double current = json.at("current").at("temperature_2m").get<double>();
double minTemp = json.at("daily").at("temperature_2m_min").at(0).get<double>();
double maxTemp = json.at("daily").at("temperature_2m_max").at(0).get<double>();
std::string currentText = "Now: " + formatTemp(current);
std::string todayText = "Today: " + formatTemp(minTemp) + " / " + formatTemp(maxTemp);
Glib::signal_idle().connect_once([this, currentText, todayText]() {
this->applyWeatherText(currentText, todayText);
});
} catch (const std::exception &ex) {
spdlog::error("Weather parse error: {}", ex.what());
Glib::signal_idle().connect_once([this]() {
this->applyWeatherText("Now: --", "Today: -- / --");
});
}
}).detach();
}
void WeatherWidget::applyWeatherText(const std::string &current_text,
const std::string &today_text) {
this->currentLabel.set_text(current_text);
this->todayLabel.set_text(today_text);
}

580
weather.json Normal file
View File

@@ -0,0 +1,580 @@
{
"latitude": 49.0,
"longitude": 8.4,
"generationtime_ms": 0.23317337036132812,
"utc_offset_seconds": 3600,
"timezone": "Europe/Berlin",
"timezone_abbreviation": "GMT+1",
"elevation": 122.0,
"current_units": {
"time": "iso8601",
"interval": "seconds",
"temperature_2m": "°C"
},
"current": {
"time": "2026-02-03T23:00",
"interval": 900,
"temperature_2m": -0.7
},
"hourly_units": {
"time": "iso8601",
"temperature_2m": "°C",
"rain": "mm"
},
"hourly": {
"time": [
"2026-02-03T00:00",
"2026-02-03T01:00",
"2026-02-03T02:00",
"2026-02-03T03:00",
"2026-02-03T04:00",
"2026-02-03T05:00",
"2026-02-03T06:00",
"2026-02-03T07:00",
"2026-02-03T08:00",
"2026-02-03T09:00",
"2026-02-03T10:00",
"2026-02-03T11:00",
"2026-02-03T12:00",
"2026-02-03T13:00",
"2026-02-03T14:00",
"2026-02-03T15:00",
"2026-02-03T16:00",
"2026-02-03T17:00",
"2026-02-03T18:00",
"2026-02-03T19:00",
"2026-02-03T20:00",
"2026-02-03T21:00",
"2026-02-03T22:00",
"2026-02-03T23:00",
"2026-02-04T00:00",
"2026-02-04T01:00",
"2026-02-04T02:00",
"2026-02-04T03:00",
"2026-02-04T04:00",
"2026-02-04T05:00",
"2026-02-04T06:00",
"2026-02-04T07:00",
"2026-02-04T08:00",
"2026-02-04T09:00",
"2026-02-04T10:00",
"2026-02-04T11:00",
"2026-02-04T12:00",
"2026-02-04T13:00",
"2026-02-04T14:00",
"2026-02-04T15:00",
"2026-02-04T16:00",
"2026-02-04T17:00",
"2026-02-04T18:00",
"2026-02-04T19:00",
"2026-02-04T20:00",
"2026-02-04T21:00",
"2026-02-04T22:00",
"2026-02-04T23:00",
"2026-02-05T00:00",
"2026-02-05T01:00",
"2026-02-05T02:00",
"2026-02-05T03:00",
"2026-02-05T04:00",
"2026-02-05T05:00",
"2026-02-05T06:00",
"2026-02-05T07:00",
"2026-02-05T08:00",
"2026-02-05T09:00",
"2026-02-05T10:00",
"2026-02-05T11:00",
"2026-02-05T12:00",
"2026-02-05T13:00",
"2026-02-05T14:00",
"2026-02-05T15:00",
"2026-02-05T16:00",
"2026-02-05T17:00",
"2026-02-05T18:00",
"2026-02-05T19:00",
"2026-02-05T20:00",
"2026-02-05T21:00",
"2026-02-05T22:00",
"2026-02-05T23:00",
"2026-02-06T00:00",
"2026-02-06T01:00",
"2026-02-06T02:00",
"2026-02-06T03:00",
"2026-02-06T04:00",
"2026-02-06T05:00",
"2026-02-06T06:00",
"2026-02-06T07:00",
"2026-02-06T08:00",
"2026-02-06T09:00",
"2026-02-06T10:00",
"2026-02-06T11:00",
"2026-02-06T12:00",
"2026-02-06T13:00",
"2026-02-06T14:00",
"2026-02-06T15:00",
"2026-02-06T16:00",
"2026-02-06T17:00",
"2026-02-06T18:00",
"2026-02-06T19:00",
"2026-02-06T20:00",
"2026-02-06T21:00",
"2026-02-06T22:00",
"2026-02-06T23:00",
"2026-02-07T00:00",
"2026-02-07T01:00",
"2026-02-07T02:00",
"2026-02-07T03:00",
"2026-02-07T04:00",
"2026-02-07T05:00",
"2026-02-07T06:00",
"2026-02-07T07:00",
"2026-02-07T08:00",
"2026-02-07T09:00",
"2026-02-07T10:00",
"2026-02-07T11:00",
"2026-02-07T12:00",
"2026-02-07T13:00",
"2026-02-07T14:00",
"2026-02-07T15:00",
"2026-02-07T16:00",
"2026-02-07T17:00",
"2026-02-07T18:00",
"2026-02-07T19:00",
"2026-02-07T20:00",
"2026-02-07T21:00",
"2026-02-07T22:00",
"2026-02-07T23:00",
"2026-02-08T00:00",
"2026-02-08T01:00",
"2026-02-08T02:00",
"2026-02-08T03:00",
"2026-02-08T04:00",
"2026-02-08T05:00",
"2026-02-08T06:00",
"2026-02-08T07:00",
"2026-02-08T08:00",
"2026-02-08T09:00",
"2026-02-08T10:00",
"2026-02-08T11:00",
"2026-02-08T12:00",
"2026-02-08T13:00",
"2026-02-08T14:00",
"2026-02-08T15:00",
"2026-02-08T16:00",
"2026-02-08T17:00",
"2026-02-08T18:00",
"2026-02-08T19:00",
"2026-02-08T20:00",
"2026-02-08T21:00",
"2026-02-08T22:00",
"2026-02-08T23:00",
"2026-02-09T00:00",
"2026-02-09T01:00",
"2026-02-09T02:00",
"2026-02-09T03:00",
"2026-02-09T04:00",
"2026-02-09T05:00",
"2026-02-09T06:00",
"2026-02-09T07:00",
"2026-02-09T08:00",
"2026-02-09T09:00",
"2026-02-09T10:00",
"2026-02-09T11:00",
"2026-02-09T12:00",
"2026-02-09T13:00",
"2026-02-09T14:00",
"2026-02-09T15:00",
"2026-02-09T16:00",
"2026-02-09T17:00",
"2026-02-09T18:00",
"2026-02-09T19:00",
"2026-02-09T20:00",
"2026-02-09T21:00",
"2026-02-09T22:00",
"2026-02-09T23:00"
],
"temperature_2m": [
2.2,
2.2,
2.2,
2.2,
2.0,
1.9,
1.8,
1.5,
1.2,
1.4,
1.8,
2.2,
2.5,
1.9,
2.6,
3.0,
2.7,
3.0,
3.0,
2.4,
1.7,
1.3,
0.9,
-0.7,
-0.2,
-0.1,
-0.5,
-0.7,
-1.4,
-1.1,
-1.0,
-1.0,
-1.1,
-0.9,
1.7,
3.7,
5.0,
5.8,
6.5,
6.9,
6.6,
5.9,
4.8,
3.6,
2.7,
2.0,
1.5,
1.1,
0.5,
0.2,
0.4,
0.9,
1.2,
1.3,
1.5,
1.7,
1.8,
2.0,
2.2,
2.7,
3.4,
4.2,
5.2,
6.1,
6.4,
5.9,
4.5,
3.2,
2.4,
1.9,
1.4,
1.1,
1.0,
0.8,
0.5,
0.3,
0.1,
-0.1,
-0.2,
-0.3,
-0.3,
-0.1,
0.7,
1.7,
2.9,
4.1,
5.0,
5.2,
5.1,
4.8,
4.3,
4.1,
4.2,
4.1,
3.8,
3.5,
3.3,
3.4,
3.4,
3.5,
3.5,
3.5,
3.4,
3.4,
3.5,
3.6,
4.1,
5.2,
6.6,
7.8,
8.4,
8.8,
8.8,
8.1,
6.9,
5.9,
5.3,
4.9,
4.6,
4.3,
4.2,
4.0,
3.9,
3.9,
3.8,
3.8,
3.8,
3.9,
4.3,
4.7,
5.3,
6.0,
6.9,
7.5,
7.6,
7.5,
7.2,
6.6,
5.8,
5.0,
4.4,
3.9,
3.5,
3.1,
2.9,
2.8,
3.0,
3.3,
3.6,
3.5,
3.4,
3.4,
3.7,
4.2,
4.7,
5.3,
6.0,
6.5,
6.8,
6.8,
6.6,
5.9,
4.8,
3.9,
3.5,
3.3,
3.1,
2.9
],
"rain": [
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.10,
0.40,
0.00,
0.00,
0.20,
0.60,
0.30,
1.30,
0.00,
0.00,
0.40,
0.10,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.10,
0.20,
0.00,
0.00,
0.00,
0.10,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00,
0.00
]
},
"daily_units": {
"time": "iso8601",
"temperature_2m_max": "°C",
"temperature_2m_min": "°C",
"weather_code": "wmo code"
},
"daily": {
"time": [
"2026-02-03",
"2026-02-04",
"2026-02-05",
"2026-02-06",
"2026-02-07",
"2026-02-08",
"2026-02-09"
],
"temperature_2m_max": [
3.0,
6.9,
6.4,
5.2,
8.8,
7.6,
6.8
],
"temperature_2m_min": [
-0.7,
-1.4,
0.2,
-0.3,
3.3,
3.1,
2.8
],
"weather_code": [
61,
45,
45,
61,
61,
3,
3
]
}
}