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 branch 'master' into feat-rtsignal

Browse Source
This commit is contained in:
hoellen
2019-03-18 19:04:11 +01:00
committed by GitHub
parent 38fa7ceab1 22cddc5e26
commit 1f924c9c06
7 changed files with 118 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/modules/network.hpp
View File

@ -21,8 +21,8 @@ class Network : public ALabel {
auto update() -> void;
private:
static const uint8_t MAX_RETRY = 5;
static const uint8_t EPOLL_MAX = 255;
static int handleEvents(struct nl_msg*, void*);
static int handleScan(struct nl_msg*, void*);
void worker();
@ -31,6 +31,7 @@ class Network : public ALabel {
void createEventSocket();
int getExternalInterface();
void getInterfaceAddress();
void handleEvents();
int netlinkRequest(void*, uint32_t, uint32_t groups = 0);
int netlinkResponse(void*, uint32_t, uint32_t groups = 0);
void parseEssid(struct nlattr**);
@ -44,7 +45,7 @@ class Network : public ALabel {
sa_family_t family_;
struct sockaddr_nl nladdr_ = {0};
struct nl_sock* sk_ = nullptr;
struct nl_sock* info_sock_ = nullptr;
int info_sock_;
int efd_;
int ev_fd_;
int nl80211_id_;

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

@ -23,9 +23,8 @@ class Workspaces : public IModule {
void onButtonReady(const Json::Value&, Gtk::Button&);
std::string getIcon(const std::string&, const Json::Value&);
bool handleScroll(GdkEventScroll*);
std::string getPrevWorkspace();
std::string getNextWorkspace();
uint16_t getWorkspaceIndex(const std::string &name);
const std::string getCycleWorkspace(uint8_t current, bool prev) const;
uint16_t getWorkspaceIndex(const std::string &name) const;
std::string trimWorkspaceName(std::string);
const Bar& bar_;