aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 18:11:35 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 18:11:35 +0000
commit1e75b8955212ad081d95606575db7809ea7ee9d3 (patch)
treeed6ac76fe0776fe307a9a55da5c0d5d9fa3c65c6 /main.c
parentwayland: implement wayl_init() (diff)
wayland: integrate directly with the FDM
Diffstat (limited to 'main.c')
-rw-r--r--main.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/main.c b/main.c
index eb91ce5b..fc9c2e8f 100644
--- a/main.c
+++ b/main.c
@@ -45,20 +45,6 @@
#define max(x, y) ((x) > (y) ? (x) : (y))
static bool
-fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
-{
- struct wayland *wayl = data;
- int event_count = wl_display_dispatch(wayl->display);
-
- if (events & EPOLLHUP) {
- LOG_ERR("disconnected from Wayland");
- return false;
- }
-
- return event_count != -1 && !wayl->term->quit;
-}
-
-static bool
fdm_ptmx(struct fdm *fdm, int fd, int events, void *data)
{
struct terminal *term = data;
@@ -650,7 +636,6 @@ main(int argc, char *const *argv)
}
}
- fdm_add(fdm, wl_display_get_fd(term.wl->display), EPOLLIN, &fdm_wayl, term.wl);
fdm_add(fdm, term.ptmx, EPOLLIN, &fdm_ptmx, &term);
fdm_add(fdm, term.wl->kbd.repeat.fd, EPOLLIN, &fdm_repeat, term.wl);
fdm_add(fdm, term.flash.fd, EPOLLIN, &fdm_flash, &term);
@@ -669,7 +654,6 @@ main(int argc, char *const *argv)
out:
if (fdm != NULL) {
- fdm_del(fdm, wl_display_get_fd(term.wl->display));
fdm_del(fdm, term.ptmx);
fdm_del(fdm, term.wl->kbd.repeat.fd);
fdm_del(fdm, term.flash.fd);