tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tray-gdbus

Browse Source
This commit is contained in:
topisani
2018-10-04 18:04:36 +02:00
parent 108b1092e5 a63650aa67
commit b231054b69
21 changed files with 132 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/modules/custom.hpp
View File

@ -13,10 +13,12 @@ class Custom : public ALabel {
Custom(const std::string, const Json::Value&);
auto update() -> void;
private:
void worker();
void delayWorker();
void continuousWorker();
const std::string name_;
waybar::util::SleeperThread thread_;
waybar::util::command::res output_;
};
}

6
include/modules/network.hpp
View File

@ -17,8 +17,8 @@ class Network : public ALabel {
~Network();
auto update() -> void;
private:
static uint64_t netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
static uint64_t netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
static int scanCb(struct nl_msg*, void*);
void disconnected();
@ -33,7 +33,7 @@ class Network : public ALabel {
int ifid_;
sa_family_t family_;
int sock_fd_;
struct sockaddr_nl nladdr_ = {0};
struct sockaddr_nl nladdr_ = {};
struct nl_sock* sk_ = nullptr;
int nl80211_id_;

4
include/modules/sway/window.hpp
View File

@ -1,6 +1,7 @@
#pragma once
#include <fmt/format.h>
#include <tuple>
#include "bar.hpp"
#include "client.hpp"
#include "util/chrono.hpp"
@ -16,7 +17,7 @@ class Window : public ALabel {
auto update() -> void;
private:
void worker();
std::string getFocusedNode(Json::Value nodes);
std::tuple<int, std::string> getFocusedNode(Json::Value nodes);
void getFocusedWindow();
Bar& bar_;
@ -24,6 +25,7 @@ class Window : public ALabel {
util::JsonParser parser_;
Ipc ipc_;
std::string window_;
int windowId_;
};
}

2
include/modules/sway/workspaces.hpp
View File

@ -18,7 +18,7 @@ class Workspaces : public IModule {
private:
void worker();
void addWorkspace(Json::Value);
std::string getIcon(std::string);
std::string getIcon(std::string, Json::Value);
bool handleScroll(GdkEventScroll*);
int getPrevWorkspace();
int getNextWorkspace();