mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Poll before wl_display_dispatch

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-02-24 13:30:54 +01:00
parent e4c1176b72
commit af7a251806
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
swaybar/bar.c
View file

@ -3,8 +3,8 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <poll.h>
#include "ipc-client.h" #include "ipc-client.h"
#include "list.h" #include "list.h"
@ -95,10 +95,22 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) {
} }
void bar_run(struct bar *bar) { void bar_run(struct bar *bar) {
fd_set readfds; int pfds = bar->outputs->length + 2;
int activity; struct pollfd *pfd = malloc(pfds * sizeof(struct pollfd));
bool dirty = true; bool dirty = true;
pfd[0].fd = bar->ipc_event_socketfd;
pfd[0].events = POLLIN;
pfd[1].fd = bar->status_read_fd;
pfd[1].events = POLLIN;
int i;
for (i = 0; i < bar->outputs->length; ++i) {
struct output *output = bar->outputs->items[i];
pfd[i+2].fd = wl_display_get_fd(output->registry->display);
pfd[i+2].events = POLLIN;
}
while (1) { while (1) {
if (dirty) { if (dirty) {
int i; int i;
@ -107,32 +119,36 @@ void bar_run(struct bar *bar) {
if (window_prerender(output->window) && output->window->cairo) { if (window_prerender(output->window) && output->window->cairo) {
render(output, bar->config, bar->status); render(output, bar->config, bar->status);
window_render(output->window); window_render(output->window);
if (wl_display_dispatch(output->registry->display) == -1) { wl_display_flush(output->registry->display);
break;
}
} }
} }
} }
dirty = false; dirty = false;
FD_ZERO(&readfds);
FD_SET(bar->ipc_event_socketfd, &readfds);
FD_SET(bar->status_read_fd, &readfds);
activity = select(FD_SETSIZE, &readfds, NULL, NULL, NULL); poll(pfd, pfds, -1);
if (activity < 0) {
sway_log(L_ERROR, "polling failed: %d", errno);
}
if (FD_ISSET(bar->ipc_event_socketfd, &readfds)) { if (pfd[0].revents & POLLIN) {
sway_log(L_DEBUG, "Got IPC event."); sway_log(L_DEBUG, "Got IPC event.");
dirty = handle_ipc_event(bar); dirty = handle_ipc_event(bar);
} }
if (bar->config->status_command && FD_ISSET(bar->status_read_fd, &readfds)) { if (bar->config->status_command && pfd[1].revents & POLLIN) {
sway_log(L_DEBUG, "Got update from status command."); sway_log(L_DEBUG, "Got update from status command.");
dirty = handle_status_line(bar); dirty = handle_status_line(bar);
} }
// dispatch wl_display events
for (i = 0; i < bar->outputs->length; ++i) {
struct output *output = bar->outputs->items[i];
if (pfd[i+2].revents & POLLIN) {
if (wl_display_dispatch(output->registry->display) == -1) {
sway_log(L_ERROR, "failed to dispatch wl: %d", errno);
}
} else {
wl_display_dispatch_pending(output->registry->display);
}
}
} }
} }