diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/poll_common.c | 18 | ||||
| -rw-r--r-- | src/poll_common.h | 8 | ||||
| -rw-r--r-- | src/window_wayland.h | 6 | ||||
| -rw-r--r-- | src/window_x11.h | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/poll_common.c b/src/poll_common.c index 945288c..ebe234d 100644 --- a/src/poll_common.c +++ b/src/poll_common.c @@ -1,10 +1,10 @@ #include <al/log.h> -#include <aki/common.h> +#include <nnwt/common.h> #include "poll_common.h" #ifdef STELA_POLL_INLINE -bool stl_poll_common(struct aki_pollfd *fds, bool block) +bool stl_poll_common(struct nn_pollfd *fds, bool block) { fds[0].revents = 0; #ifdef STELA_PAUSE @@ -12,11 +12,11 @@ bool stl_poll_common(struct aki_pollfd *fds, bool block) #endif #ifdef STELA_PAUSE - if (aki_poll_fds(fds, 2, (block) ? -1 : 0) < 0 && errno != EINTR) { + if (nn_poll_fds(fds, 2, (block) ? -1 : 0) < 0 && errno != EINTR) { #else - if (aki_poll_fds(fds, 1, (block) ? -1 : 0) < 0 && errno != EINTR) { + if (nn_poll_fds(fds, 1, (block) ? -1 : 0) < 0 && errno != EINTR) { #endif - al_log_error("poll_common", "poll() failed (%s).", errno, aki_strerror(errno)); + al_log_error("poll_common", "poll() failed (%s).", errno, nn_strerror(errno)); return false; } @@ -31,26 +31,26 @@ bool stl_poll_common(struct aki_pollfd *fds, bool block) return true; } #ifdef STELA_PAUSE -void stl_wake_common(struct stl_window *window, struct aki_pollfd *fds) +void stl_wake_common(struct stl_window *window, struct nn_pollfd *fds) { window->pending_refresh = true; // If we are already in poll, don't try to wake again instead // just ensure we refresh. if (!(fds[0].revents & POLLIN || fds[1].revents & POLLIN)) { s64 val = 1; - ssize_t ret = aki_write(fds[1].fd, &val, sizeof(s64)); + ssize_t ret = nn_write(fds[1].fd, &val, sizeof(s64)); al_assert(ret == sizeof(s64)); } } #endif #endif -bool stl_process_events_common(struct aki_pollfd *fds) +bool stl_process_events_common(struct nn_pollfd *fds) { #ifdef STELA_POLL_INLINE #ifdef STELA_PAUSE if (fds[1].revents & POLLIN) { - s64 val = aki_read(fds[1].fd, &val, sizeof(s64)); + s64 val = nn_read(fds[1].fd, &val, sizeof(s64)); al_assert(val == sizeof(s64)); } #endif diff --git a/src/poll_common.h b/src/poll_common.h index aebf9a3..0efa500 100644 --- a/src/poll_common.h +++ b/src/poll_common.h @@ -1,13 +1,13 @@ #pragma once -#include <aki/socket.h> +#include <nnwt/socket.h> #include "window.h" #ifdef STELA_POLL_INLINE -bool stl_poll_common(struct aki_pollfd *fds, bool block); +bool stl_poll_common(struct nn_pollfd *fds, bool block); #ifdef STELA_PAUSE -void stl_wake_common(struct stl_window *window, struct aki_pollfd *fds); +void stl_wake_common(struct stl_window *window, struct nn_pollfd *fds); #endif #endif -bool stl_process_events_common(struct aki_pollfd *fds); +bool stl_process_events_common(struct nn_pollfd *fds); diff --git a/src/window_wayland.h b/src/window_wayland.h index b7dadf3..9895463 100644 --- a/src/window_wayland.h +++ b/src/window_wayland.h @@ -1,7 +1,7 @@ #pragma once #include <al/lib.h> -#include <aki/socket.h> +#include <nnwt/socket.h> #include <wayland-client-core.h> #include <wayland-client-protocol.h> @@ -56,9 +56,9 @@ struct stl_window_wayland { struct stl_egl egl; struct wl_egl_window *egl_window; #if defined STELA_POLL_INLINE && defined STELA_PAUSE - struct aki_pollfd fds[2]; + struct nn_pollfd fds[2]; #else - struct aki_pollfd fds[1]; + struct nn_pollfd fds[1]; #endif f64 pointer_x; f64 pointer_y; diff --git a/src/window_x11.h b/src/window_x11.h index fc1172f..d198115 100644 --- a/src/window_x11.h +++ b/src/window_x11.h @@ -1,6 +1,6 @@ #pragma once -#include <aki/socket.h> +#include <nnwt/socket.h> #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -23,8 +23,8 @@ struct stl_window_x11 { Window window; struct stl_egl egl; #ifdef STELA_PAUSE - struct aki_pollfd fds[2]; + struct nn_pollfd fds[2]; #else - struct aki_pollfd fds[1]; + struct nn_pollfd fds[1]; #endif }; |