refactor: fetch outputs from Gtk::Display instead of wl_registry.

gtk-layer-shell wants Gdk::Monitor instead of wl_output;
change code to deal with Gdk objects and slightly simplify it.
Requires gtkmm 3.22.0+ (first release with Gdk::Monitor support).
This commit is contained in:
Aleksei Bavshin
2019-08-27 20:57:23 -07:00
parent 2277ddd156
commit d1637d34cf
5 changed files with 64 additions and 82 deletions

View File

@ -1,5 +1,6 @@
#pragma once
#include <gdkmm/monitor.h>
#include <glibmm/refptr.h>
#include <gtkmm/box.h>
#include <gtkmm/cssprovider.h>
@ -15,10 +16,11 @@ namespace waybar {
class Factory;
struct waybar_output {
struct wl_output * output = nullptr;
std::string name;
uint32_t wl_name;
struct zxdg_output_v1 *xdg_output = nullptr;
Glib::RefPtr<Gdk::Monitor> monitor;
std::string name;
std::unique_ptr<struct zxdg_output_v1, decltype(&zxdg_output_v1_destroy)> xdg_output = {
nullptr, &zxdg_output_v1_destroy};
};
class Bar {