mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-30 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #892

Browse source 
Removed additional event socket to reduce synchronisation problems
and limited workspace update requests count.
This commit is contained in:
Ilya Lukyanov 2017-08-04 15:16:05 +03:00
parent f8d0e1f946
commit 8dec814bb4
No known key found for this signature in database
GPG key ID: 382C32164F3D37D4
5 changed files with 49 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
swaybar/bar.c
View file

@ -155,7 +155,6 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) {
/* connect to sway ipc */
bar->ipc_socketfd = ipc_open_socket(socket_path);
bar->ipc_event_socketfd = ipc_open_socket(socket_path);
ipc_bar_init(bar, bar_id);
@ -205,7 +204,7 @@ bool dirty = true;
static void respond_ipc(int fd, short mask, void *_bar) {
struct bar *bar = (struct bar *)_bar;
sway_log(L_DEBUG, "Got IPC event.");
sway_log(L_DEBUG, "Got IPC event or reply.");
dirty = handle_ipc_event(bar);
}
@ -222,7 +221,7 @@ static void respond_output(int fd, short mask, void *_output) {
}
void bar_run(struct bar *bar) {
add_event(bar->ipc_event_socketfd, POLLIN, respond_ipc, bar);
add_event(bar->ipc_socketfd, POLLIN, respond_ipc, bar);
add_event(bar->status_read_fd, POLLIN, respond_command, bar);
int i;
@ -322,10 +321,6 @@ void bar_teardown(struct bar *bar) {
close(bar->ipc_socketfd);
}
if (bar->ipc_event_socketfd) {
close(bar->ipc_event_socketfd);
}
/* terminate status command process */
terminate_status_command(bar->status_command_pid);
}