toby/somebar
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rebase ipc.patch

Browse source
This commit is contained in:
Raphael Robatsch 2023-02-25 09:06:44 +01:00
parent 624e92927b
commit 9cdbf5f56f
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
contrib/ipc.patch
View file

@ -193,7 +193,7 @@ index 0000000..390f5a1
+ </interface> + </interface>
+</protocol> +</protocol>
diff --git a/src/common.hpp b/src/common.hpp diff --git a/src/common.hpp b/src/common.hpp
index aed4480..12a3e2e 100644 index c905358..9b62a94 100644
--- a/src/common.hpp --- a/src/common.hpp
+++ b/src/common.hpp +++ b/src/common.hpp
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -219,7 +219,7 @@ index aed4480..12a3e2e 100644
void spawn(Monitor&, const Arg& arg); void spawn(Monitor&, const Arg& arg);
void setCloexec(int fd); void setCloexec(int fd);
[[noreturn]] void die(const char* why); [[noreturn]] void die(const char* why);
@@ -59,6 +67,7 @@ WL_DELETER(wl_output, wl_output_release); @@ -65,6 +73,7 @@ WL_DELETER(wl_output, wl_output_release_checked);
WL_DELETER(wl_pointer, wl_pointer_release); WL_DELETER(wl_pointer, wl_pointer_release);
WL_DELETER(wl_seat, wl_seat_release); WL_DELETER(wl_seat, wl_seat_release);
WL_DELETER(wl_surface, wl_surface_destroy); WL_DELETER(wl_surface, wl_surface_destroy);
@ -250,7 +250,7 @@ index 40a8c95..a9560cb 100644
{ ClkStatusText, BTN_RIGHT, spawn, {.v = termcmd} }, { ClkStatusText, BTN_RIGHT, spawn, {.v = termcmd} },
}; };
diff --git a/src/main.cpp b/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp
index 6198d8b..9e7549a 100644 index 6274959..01be870 100644
--- a/src/main.cpp --- a/src/main.cpp
+++ b/src/main.cpp +++ b/src/main.cpp
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
@ -403,8 +403,8 @@ index 6198d8b..9e7549a 100644
- wl_display_roundtrip(display); // wait for xdg_output names before we read stdin - wl_display_roundtrip(display); // wait for xdg_output names before we read stdin
} }
void setupStatusFifo() bool createFifo(std::string path)
@@ -259,66 +331,6 @@ void setupStatusFifo() @@ -273,68 +345,6 @@ void setupStatusFifo()
} }
} }
@ -435,6 +435,7 @@ index 6198d8b..9e7549a 100644
- return; - return;
- if (command == "title") { - if (command == "title") {
- auto title = std::string {}; - auto title = std::string {};
- stream >> std::ws;
- std::getline(stream, title); - std::getline(stream, title);
- mon->bar.setTitle(title); - mon->bar.setTitle(title);
- } else if (command == "selmon") { - } else if (command == "selmon") {
@ -461,6 +462,7 @@ index 6198d8b..9e7549a 100644
- mon->tags = tags; - mon->tags = tags;
- } else if (command == "layout") { - } else if (command == "layout") {
- auto layout = std::string {}; - auto layout = std::string {};
- stream >> std::ws;
- std::getline(stream, layout); - std::getline(stream, layout);
- mon->bar.setLayout(layout); - mon->bar.setLayout(layout);
- } - }
@ -471,7 +473,7 @@ index 6198d8b..9e7549a 100644
const std::string prefixStatus = "status "; const std::string prefixStatus = "status ";
const std::string prefixShow = "show "; const std::string prefixShow = "show ";
const std::string prefixHide = "hide "; const std::string prefixHide = "hide ";
@@ -393,6 +405,10 @@ void onGlobalAdd(void*, wl_registry* registry, uint32_t name, const char* interf @@ -409,6 +419,10 @@ void onGlobalAdd(void*, wl_registry* registry, uint32_t name, const char* interf
xdg_wm_base_add_listener(xdgWmBase, &xdgWmBaseListener, nullptr); xdg_wm_base_add_listener(xdgWmBase, &xdgWmBaseListener, nullptr);
return; return;
} }
@ -482,7 +484,7 @@ index 6198d8b..9e7549a 100644
if (wl_seat* wlSeat; reg.handle(wlSeat, wl_seat_interface, 7)) { if (wl_seat* wlSeat; reg.handle(wlSeat, wl_seat_interface, 7)) {
auto& seat = seats.emplace_back(Seat {name, wl_unique_ptr<wl_seat> {wlSeat}}); auto& seat = seats.emplace_back(Seat {name, wl_unique_ptr<wl_seat> {wlSeat}});
wl_seat_add_listener(wlSeat, &seatListener, &seat); wl_seat_add_listener(wlSeat, &seatListener, &seat);
@@ -494,10 +510,6 @@ int main(int argc, char* argv[]) @@ -522,10 +536,6 @@ int main(int argc, char* argv[])
.fd = displayFd, .fd = displayFd,
.events = POLLIN, .events = POLLIN,
}); });
@ -493,7 +495,7 @@ index 6198d8b..9e7549a 100644
if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0) {
diesys("fcntl F_SETFL"); diesys("fcntl F_SETFL");
} }
@@ -522,8 +534,6 @@ int main(int argc, char* argv[]) @@ -550,8 +560,6 @@ int main(int argc, char* argv[])
ev.events = POLLIN; ev.events = POLLIN;
waylandFlush(); waylandFlush();
} }