From 00931f2f8fa4098c5e70b5ececd6d2dcb8786f90 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 7 May 2017 12:26:48 -0400 Subject: [PATCH] Generalize output handling --- backend/CMakeLists.txt | 8 +- backend/backend.c | 3 +- backend/drm/backend.c | 11 +- backend/drm/drm.c | 387 +++++++++++++++++----------------- example/CMakeLists.txt | 8 - example/example-drm.c | 124 ----------- example/main.c | 142 +++++++++++-- include/backend/drm/drm.h | 15 +- include/wayland.h | 18 ++ include/wlr/backend.h | 1 - include/wlr/backend/drm.h | 20 +- include/wlr/wayland.h | 41 ++-- wayland/CMakeLists.txt | 3 +- wayland/types/wlr_output.c | 31 +++ wayland/types/wlr_wl_output.c | 16 -- wayland/types/wlr_wl_seat.c | 19 -- 16 files changed, 405 insertions(+), 442 deletions(-) delete mode 100644 example/example-drm.c create mode 100644 include/wayland.h create mode 100644 wayland/types/wlr_output.c delete mode 100644 wayland/types/wlr_wl_output.c delete mode 100644 wayland/types/wlr_wl_seat.c diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 7183617c..fc1793cf 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -5,10 +5,10 @@ include_directories( ) add_library(wlr-backend - wayland/backend.c - wayland/registry.c - wayland/wl_seat.c - wayland/wl_output.c + #wayland/backend.c + #wayland/registry.c + #wayland/wl_seat.c + #wayland/wl_output.c drm/backend.c drm/drm.c drm/udev.c diff --git a/backend/backend.c b/backend/backend.c index e40aaefe..753bb3ae 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -16,7 +16,6 @@ struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl, backend->impl = impl; wl_signal_init(&backend->events.output_add); wl_signal_init(&backend->events.output_remove); - wl_signal_init(&backend->events.output_frame); wl_signal_init(&backend->events.keyboard_add); wl_signal_init(&backend->events.keyboard_remove); wl_signal_init(&backend->events.pointer_add); @@ -32,6 +31,6 @@ bool wlr_backend_init(struct wlr_backend *backend) { void wlr_backend_destroy(struct wlr_backend *backend) { backend->impl->destroy(backend->state); - // TODO: Free anything else? + // TODO: free outputs free(backend); } diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 8c02669a..0da84745 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -19,18 +19,11 @@ static bool wlr_drm_backend_init(struct wlr_backend_state *state) { return true; } -static void free_output(void *item) { - struct wlr_drm_output *out = item; - wlr_drm_output_cleanup(out, true); - free(out); -} - static void wlr_drm_backend_destroy(struct wlr_backend_state *state) { if (!state) { return; } - list_foreach(state->outputs, free_output); - list_free(state->outputs); + // TODO: free outputs in shared backend code wlr_drm_renderer_free(&state->renderer); wlr_udev_free(&state->udev); wlr_session_close_file(state->session, state->fd); @@ -86,6 +79,8 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, goto error_fd; } + // TODO: what is the difference between the per-output renderer and this + // one? if (!wlr_drm_renderer_init(&state->renderer, state->fd)) { wlr_log(L_ERROR, "Failed to initialize renderer"); goto error_event; diff --git a/backend/drm/drm.c b/backend/drm/drm.c index abb3fb26..5b186e41 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -13,6 +13,7 @@ #include #include +#include "wayland.h" #include "backend.h" #include "backend/drm/backend.h" #include "backend/drm/drm.h" @@ -39,7 +40,6 @@ static const char *conn_name[] = { }; bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) { - renderer->gbm = gbm_create_device(fd); if (!renderer->gbm) { wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno)); @@ -59,7 +59,6 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { if (!renderer) { return; } - wlr_egl_free(&renderer->egl); gbm_device_destroy(renderer->gbm); } @@ -95,79 +94,162 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) { return *id; } -void wlr_drm_output_begin(struct wlr_drm_output *out) { - struct wlr_drm_renderer *renderer = out->renderer; - eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); +void wlr_drm_output_begin(struct wlr_output *output) { + struct wlr_output_state *_output = output->state; + struct wlr_drm_renderer *renderer = _output->renderer; + eglMakeCurrent(renderer->egl.display, _output->egl, + _output->egl, renderer->egl.context); } -void wlr_drm_output_end(struct wlr_drm_output *out) { - struct wlr_drm_renderer *renderer = out->renderer; - eglSwapBuffers(renderer->egl.display, out->egl); +void wlr_drm_output_end(struct wlr_output *output) { + struct wlr_output_state *_output = output->state; + struct wlr_drm_renderer *renderer = _output->renderer; - struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm); + eglSwapBuffers(renderer->egl.display, _output->egl); + struct gbm_bo *bo = gbm_surface_lock_front_buffer(_output->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - - drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); - - gbm_surface_release_buffer(out->gbm, bo); - - out->pageflip_pending = true; + drmModePageFlip(renderer->fd, _output->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, _output); + gbm_surface_release_buffer(_output->gbm, bo); + _output->pageflip_pending = true; } static bool display_init_renderer(struct wlr_drm_renderer *renderer, - struct wlr_drm_output *out) { - - out->renderer = renderer; - - out->gbm = gbm_surface_create(renderer->gbm, out->width, out->height, - GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); - if (!out->gbm) { - wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", out->name, + struct wlr_output_state *output) { + struct wlr_output_mode *mode = output->wlr_output->current_mode; + output->renderer = renderer; + output->gbm = gbm_surface_create(renderer->gbm, mode->width, + mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); + if (!output->gbm) { + wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->name, strerror(errno)); return false; } - out->egl = wlr_egl_create_surface(&renderer->egl, out->gbm); - if (out->egl == EGL_NO_SURFACE) { - wlr_log(L_ERROR, "Failed to create EGL surface for %s", out->name); + output->egl = wlr_egl_create_surface(&renderer->egl, output->gbm); + if (output->egl == EGL_NO_SURFACE) { + wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->name); return false; } // Render black frame + eglMakeCurrent(renderer->egl.display, output->egl, output->egl, renderer->egl.context); - eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); - - glViewport(0, 0, out->width, out->height); + glViewport(0, 0, output->width, output->height); glClearColor(0.0, 0.0, 0.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); - eglSwapBuffers(renderer->egl.display, out->egl); + eglSwapBuffers(renderer->egl.display, output->egl); - struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm); + struct gbm_bo *bo = gbm_surface_lock_front_buffer(output->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - drmModeSetCrtc(renderer->fd, out->crtc, fb_id, 0, 0, - &out->connector, 1, &out->active_mode->mode); - drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); - - gbm_surface_release_buffer(out->gbm, bo); + drmModeSetCrtc(renderer->fd, output->crtc, fb_id, 0, 0, + &output->connector, 1, &mode->state->mode); + drmModePageFlip(renderer->fd, output->crtc, fb_id, + DRM_MODE_PAGE_FLIP_EVENT, output); + gbm_surface_release_buffer(output->gbm, bo); return true; } static int find_id(const void *item, const void *cmp_to) { - const struct wlr_drm_output *out = item; + const struct wlr_output_state *output = item; const uint32_t *id = cmp_to; - if (out->connector < *id) { + if (output->connector < *id) { return -1; - } else if (out->connector > *id) { + } else if (output->connector > *id) { return 1; } else { return 0; } } +static bool wlr_drm_output_set_mode(struct wlr_output_state *output, + struct wlr_output_mode *mode) { + struct wlr_backend_state *state = + wl_container_of(output->renderer, state, renderer); + + wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->name, + mode->width, mode->height, mode->refresh); + + drmModeConnector *conn = drmModeGetConnector(state->fd, output->connector); + if (!conn) { + wlr_log(L_ERROR, "Failed to get DRM connector"); + goto error; + } + + if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) { + wlr_log(L_ERROR, "%s is not connected", output->name); + goto error; + } + + drmModeRes *res = drmModeGetResources(state->fd); + if (!res) { + wlr_log(L_ERROR, "Failed to get DRM resources"); + goto error; + } + + bool success = false; + for (int i = 0; !success && i < conn->count_encoders; ++i) { + drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]); + if (!enc) { + continue; + } + + for (int j = 0; j < res->count_crtcs; ++j) { + if ((enc->possible_crtcs & (1 << j)) == 0) { + continue; + } + + if ((state->taken_crtcs & (1 << j)) == 0) { + state->taken_crtcs |= 1 << j; + output->crtc = res->crtcs[j]; + success = true; + break; + } + } + drmModeFreeEncoder(enc); + } + + drmModeFreeResources(res); + + if (!success) { + wlr_log(L_ERROR, "Failed to find CRTC for %s", output->name); + goto error; + } + + output->state = DRM_OUTPUT_CONNECTED; + output->width = mode->width; + output->height = mode->height; + output->wlr_output->current_mode = mode; + + if (!display_init_renderer(&state->renderer, output)) { + wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->name); + goto error; + } + + drmModeFreeConnector(conn); + return true; + +error: + // TODO: destroy + wlr_drm_output_cleanup(output, false); + drmModeFreeConnector(conn); + return false; +} + +static void wlr_drm_output_destroy(struct wlr_output_state *output) { + wlr_drm_output_cleanup(output, true); + wlr_drm_renderer_free(output->renderer); + free(output); +} + +static struct wlr_output_impl output_impl = { + .set_mode = wlr_drm_output_set_mode, + .destroy = wlr_drm_output_destroy, +}; + void wlr_drm_scan_connectors(struct wlr_backend_state *state) { wlr_log(L_INFO, "Scanning DRM connectors"); @@ -186,171 +268,98 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state) { continue; } - struct wlr_drm_output *out; + struct wlr_output_state *output; + struct wlr_output *wlr_output; int index = list_seq_find(state->outputs, find_id, &id); if (index == -1) { - out = calloc(1, sizeof(struct wlr_drm_output)); - if (!out) { + output = calloc(1, sizeof(struct wlr_output_state)); + if (!state) { + drmModeFreeConnector(conn); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return; + } + wlr_output = output->wlr_output = wlr_output_create(&output_impl, output); + if (!wlr_output) { drmModeFreeConnector(conn); - continue; + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return; } - out->renderer = &state->renderer; - out->state = DRM_OUTPUT_DISCONNECTED; - out->connector = id; - snprintf(out->name, sizeof out->name, "%s-%"PRIu32, + output->renderer = &state->renderer; + output->state = DRM_OUTPUT_DISCONNECTED; + output->connector = id; + // TODO: Populate more wlr_output fields + // TODO: Move this to wlr_output->name + snprintf(output->name, sizeof(output->name), "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); drmModeEncoder *curr_enc = drmModeGetEncoder(state->fd, conn->encoder_id); if (curr_enc) { - out->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id); + output->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id); free(curr_enc); } - list_add(state->outputs, out); - wlr_log(L_INFO, "Found display '%s'", out->name); + list_add(state->outputs, output); + wlr_log(L_INFO, "Found display '%s'", output->name); } else { - out = state->outputs->items[index]; + output = state->outputs->items[index]; + wlr_output = output->wlr_output; } - if (out->state == DRM_OUTPUT_DISCONNECTED && + // TODO: move state into wlr_output + if (output->state == DRM_OUTPUT_DISCONNECTED && conn->connection == DRM_MODE_CONNECTED) { - wlr_log(L_INFO, "'%s' connected", out->name); - - out->modes = malloc(sizeof(*out->modes) * conn->count_modes); - if (!out->modes) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); - goto error; - } - + wlr_log(L_INFO, "'%s' connected", output->name); wlr_log(L_INFO, "Detected modes:"); - out->num_modes = conn->count_modes; for (int i = 0; i < conn->count_modes; ++i) { - drmModeModeInfo *mode = &conn->modes[i]; - out->modes[i].width = mode->hdisplay; - out->modes[i].height = mode->vdisplay; + struct wlr_output_mode_state *_state = calloc(1, + sizeof(struct wlr_output_mode_state)); + _state->mode = conn->modes[i]; + struct wlr_output_mode *mode = calloc(1, + sizeof(struct wlr_output_mode)); + mode->width = _state->mode.hdisplay; // TODO: Calculate more accurate refresh rate - out->modes[i].rate = mode->vrefresh; - out->modes[i].mode = *mode; + // TODO: Check that this refresh rate is mHz + mode->height = _state->mode.vdisplay; + mode->state = _state; wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, - mode->hdisplay, mode->vdisplay, - mode->vrefresh); - } - - out->state = DRM_OUTPUT_NEEDS_MODESET; - wlr_log(L_INFO, "Sending modesetting signal for '%s'", out->name); - wl_signal_emit(&state->backend->events.output_add, out); - } else if (out->state == DRM_OUTPUT_CONNECTED && - conn->connection != DRM_MODE_CONNECTED) { - - wlr_log(L_INFO, "'%s' disconnected", out->name); - wlr_drm_output_cleanup(out, false); - } -error: - drmModeFreeConnector(conn); - } - - drmModeFreeResources(res); -} - -struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count) { - if (out->state == DRM_OUTPUT_DISCONNECTED) { - *count = 0; - return NULL; - } - - *count = out->num_modes; - return out->modes; -} - -bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode) { - struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer); - - wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u'", out->name, mode->width, - mode->height, mode->rate); - - drmModeConnector *conn = drmModeGetConnector(state->fd, out->connector); - if (!conn) { - wlr_log(L_ERROR, "Failed to get DRM connector"); - goto error; - } - - if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) { - wlr_log(L_ERROR, "%s is not connected", out->name); - goto error; - } - - drmModeRes *res = drmModeGetResources(state->fd); - if (!res) { - wlr_log(L_ERROR, "Failed to get DRM resources"); - goto error; - } - - bool success = false; - for (int i = 0; !success && i < conn->count_encoders; ++i) { - drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]); - if (!enc) - continue; + _state->mode.hdisplay, _state->mode.vdisplay, + _state->mode.vrefresh); - for (int j = 0; j < res->count_crtcs; ++j) { - if ((enc->possible_crtcs & (1 << j)) == 0) { - continue; + list_add(wlr_output->modes, mode); } - if ((state->taken_crtcs & (1 << j)) == 0) { - state->taken_crtcs |= 1 << j; - out->crtc = res->crtcs[j]; + output->state = DRM_OUTPUT_NEEDS_MODESET; + wlr_log(L_INFO, "Sending modesetting signal for '%s'", output->name); + wl_signal_emit(&state->backend->events.output_add, wlr_output); + } else if (output->state == DRM_OUTPUT_CONNECTED && + conn->connection != DRM_MODE_CONNECTED) { - success = true; - break; - } + wlr_log(L_INFO, "'%s' disconnected", output->name); + // TODO: Destroy + wlr_drm_output_cleanup(output, false); } - drmModeFreeEncoder(enc); + drmModeFreeConnector(conn); } drmModeFreeResources(res); - - if (!success) { - wlr_log(L_ERROR, "Failed to find CRTC for %s", out->name); - goto error; - } - - out->state = DRM_OUTPUT_CONNECTED; - out->active_mode = mode; - out->width = mode->width; - out->height = mode->height; - - if (!display_init_renderer(&state->renderer, out)) { - wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name); - goto error; - } - - drmModeFreeConnector(conn); - - return true; - -error: - wlr_drm_output_cleanup(out, false); - drmModeFreeConnector(conn); - - return false; } static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, void *user) { - struct wlr_drm_output *out = user; - struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer); + struct wlr_output_state *output = user; + struct wlr_backend_state *state = + wl_container_of(output->renderer, state, renderer); - out->pageflip_pending = false; - if (out->state == DRM_OUTPUT_CONNECTED) { - wl_signal_emit(&state->backend->events.output_frame, out); + output->pageflip_pending = false; + if (output->state == DRM_OUTPUT_CONNECTED) { + wl_signal_emit(&output->wlr_output->events.frame, output->wlr_output); } } @@ -361,66 +370,50 @@ int wlr_drm_event(int fd, uint32_t mask, void *data) { }; drmHandleEvent(fd, &event); - return 1; } -static void restore_output(struct wlr_drm_output *out, int fd) { +static void restore_output(struct wlr_output_state *output, int fd) { // Wait for any pending pageflips to finish - while (out->pageflip_pending) { + while (output->pageflip_pending) { wlr_drm_event(fd, 0, NULL); } - drmModeCrtc *crtc = out->old_crtc; + drmModeCrtc *crtc = output->old_crtc; if (!crtc) { return; } drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, - &out->connector, 1, &crtc->mode); + &output->connector, 1, &crtc->mode); drmModeFreeCrtc(crtc); } -void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { - if (!out) { +void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) { + if (!output) { return; } - struct wlr_drm_renderer *renderer = out->renderer; + struct wlr_drm_renderer *renderer = output->renderer; struct wlr_backend_state *state = wl_container_of(renderer, state, renderer); - switch (out->state) { + switch (output->state) { case DRM_OUTPUT_CONNECTED: - eglDestroySurface(renderer->egl.display, out->egl); - gbm_surface_destroy(out->gbm); - - out->egl = EGL_NO_SURFACE; - out->gbm = NULL; + eglDestroySurface(renderer->egl.display, output->egl); + gbm_surface_destroy(output->gbm); + output->egl = EGL_NO_SURFACE; + output->gbm = NULL; /* Fallthrough */ - case DRM_OUTPUT_NEEDS_MODESET: - free(out->modes); - out->num_modes = 0; - out->modes = NULL; - out->active_mode = NULL; - out->width = 0; - out->height = 0; - - out->state = DRM_OUTPUT_DISCONNECTED; - + output->state = DRM_OUTPUT_DISCONNECTED; if (restore) { - restore_output(out, renderer->fd); + restore_output(output, renderer->fd); } - - wlr_log(L_INFO, "Emmiting destruction signal for '%s'", out->name); - wl_signal_emit(&state->backend->events.output_remove, out); + wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->name); + wl_signal_emit(&state->backend->events.output_remove, output->wlr_output); break; - case DRM_OUTPUT_DISCONNECTED: break; } -} - -const char *wlr_drm_output_get_name(struct wlr_drm_output *out) { - return out->name; + // TODO: free wlr_output } diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 29a77675..f619b97f 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -8,13 +8,5 @@ add_executable(example target_link_libraries(example wlr-backend -) - -add_executable(example-drm - example-drm.c -) - -target_link_libraries(example-drm - wlr-backend wlr-session ) diff --git a/example/example-drm.c b/example/example-drm.c deleted file mode 100644 index 2e33e039..00000000 --- a/example/example-drm.c +++ /dev/null @@ -1,124 +0,0 @@ -#define _POSIX_C_SOURCE 199309L -#include -#include -#include -#include -#include - -#include -#include - -struct state { - float color[3]; - int dec; - - struct timespec last_frame; - - struct wl_listener output_add; - struct wl_listener output_remove; - struct wl_listener output_frame; -}; - -void output_add(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - fprintf(stderr, "Output '%s' added\n", wlr_drm_output_get_name(out)); - - size_t num_modes; - struct wlr_drm_mode *modes = wlr_drm_output_get_modes(out, &num_modes); - - wlr_drm_output_modeset(out, &modes[0]); -} - -void output_remove(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - fprintf(stderr, "Output '%s' removed\n", wlr_drm_output_get_name(out)); -} - -void output_frame(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - struct state *s = wl_container_of(listener, s, output_frame); - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - - long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + - (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; - int inc = (s->dec + 1) % 3; - - s->color[inc] += ms / 2000.0f; - s->color[s->dec] -= ms / 2000.0f; - - if (s->color[s->dec] < 0.0f) { - s->color[inc] = 1.0f; - s->color[s->dec] = 0.0f; - - s->dec = inc; - } - - s->last_frame = now; - - wlr_drm_output_begin(out); - - glClearColor(s->color[0], s->color[1], s->color[2], 1.0); - glClear(GL_COLOR_BUFFER_BIT); - - wlr_drm_output_end(out); -} - -int timer_done(void *data) { - *(bool *)data = true; - return 1; -} - -int main() { - if (getenv("DISPLAY")) { - fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); - return 1; - } else if (getenv("WAYLAND_DISPLAY")) { - fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); - return 1; - } - - struct state state = { - .color = { 1.0, 0.0, 0.0 }, - .dec = 0, - .output_add = { .notify = output_add }, - .output_remove = { .notify = output_remove }, - .output_frame = { .notify = output_frame }, - }; - - wl_list_init(&state.output_add.link); - wl_list_init(&state.output_remove.link); - wl_list_init(&state.output_frame.link); - clock_gettime(CLOCK_MONOTONIC, &state.last_frame); - - struct wl_display *display = wl_display_create(); - struct wl_event_loop *event_loop = wl_display_get_event_loop(display); - - struct wlr_session *session = wlr_session_start(); - if (!session) { - return 1; - } - - struct wlr_backend *wlr = wlr_drm_backend_create(display, session); - wl_signal_add(&wlr->events.output_add, &state.output_add); - wl_signal_add(&wlr->events.output_remove, &state.output_remove); - wl_signal_add(&wlr->events.output_frame, &state.output_frame); - if (!wlr || !wlr_backend_init(wlr)) { - return 1; - } - - bool done = false; - struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, - timer_done, &done); - - wl_event_source_timer_update(timer, 5000); - - while (!done) { - wl_event_loop_dispatch(event_loop, 0); - } - - wl_event_source_remove(timer); - wlr_backend_destroy(wlr); - wl_display_destroy(display); -} diff --git a/example/main.c b/example/main.c index 4240b9e3..2c168d98 100644 --- a/example/main.c +++ b/example/main.c @@ -1,19 +1,133 @@ -#define _POSIX_C_SOURCE 200112L +#define _POSIX_C_SOURCE 199309L +#include #include -#include -#include +#include #include +#include +#include +#include +#include -int main(int argc, char **argv) { - // TODO: Move this stuff to a wlr backend selector function - char *_wl_display = getenv("WAYLAND_DISPLAY"); - if (_wl_display) { - unsetenv("WAYLAND_DISPLAY"); - setenv("_WAYLAND_DISPLAY", _wl_display, 1); +struct state { + float color[3]; + int dec; + struct timespec last_frame; + struct wl_listener output_add; + struct wl_listener output_remove; + list_t *outputs; +}; + +struct output_state { + struct wlr_output *output; + struct state *state; + struct wl_listener frame; +}; + +void output_frame(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct output_state *ostate = wl_container_of( + listener, ostate, frame); + struct state *s = ostate->state; + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + + long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + + (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; + int inc = (s->dec + 1) % 3; + + s->color[inc] += ms / 2000.0f; + s->color[s->dec] -= ms / 2000.0f; + + if (s->color[s->dec] < 0.0f) { + s->color[inc] = 1.0f; + s->color[s->dec] = 0.0f; + + s->dec = inc; + } + + s->last_frame = now; + + wlr_drm_output_begin(output); + + glClearColor(s->color[0], s->color[1], s->color[2], 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + wlr_drm_output_end(output); +} + +void output_add(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct state *state = wl_container_of(listener, state, output_add); + fprintf(stderr, "Output '%s' added\n", output->name); + wlr_output_set_mode(output, output->modes->items[0]); + struct output_state *ostate = calloc(1, sizeof(struct output_state)); + ostate->output = output; + ostate->state = state; + ostate->frame.notify = output_frame; + wl_list_init(&ostate->frame.link); + wl_signal_add(&output->events.frame, &ostate->frame); + list_add(state->outputs, ostate); +} + +void output_remove(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + fprintf(stderr, "Output '%s' removed\n", output->name); + // TODO: remove signal from state->output_frame +} + +int timer_done(void *data) { + *(bool *)data = true; + return 1; +} + +int main() { + if (getenv("DISPLAY")) { + fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); + return 1; + } else if (getenv("WAYLAND_DISPLAY")) { + fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); + return 1; + } + + struct state state = { + .color = { 1.0, 0.0, 0.0 }, + .dec = 0, + .output_add = { .notify = output_add }, + .output_remove = { .notify = output_remove }, + .outputs = list_create(), + }; + + wl_list_init(&state.output_add.link); + wl_list_init(&state.output_remove.link); + clock_gettime(CLOCK_MONOTONIC, &state.last_frame); + + struct wl_display *display = wl_display_create(); + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + + struct wlr_session *session = wlr_session_start(); + if (!session) { + return 1; + } + + struct wlr_backend *wlr = wlr_drm_backend_create(display, session); + wl_signal_add(&wlr->events.output_add, &state.output_add); + wl_signal_add(&wlr->events.output_remove, &state.output_remove); + if (!wlr || !wlr_backend_init(wlr)) { + return 1; + } + + bool done = false; + struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, + timer_done, &done); + + wl_event_source_timer_update(timer, 5000); + + while (!done) { + wl_event_loop_dispatch(event_loop, 0); } - struct wl_display *wl_display = wl_display_create(); - struct wlr_wl_backend *backend = wlr_wl_backend_init(wl_display, 1); - wlr_wl_backend_free(backend); - wl_display_destroy(wl_display); - return 0; + + wl_event_source_remove(timer); + wlr_backend_destroy(wlr); + wl_display_destroy(display); } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 3e83058a..4b42aa68 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -12,7 +12,6 @@ struct wlr_drm_renderer { int fd; - struct gbm_device *gbm; struct wlr_egl egl; }; @@ -26,15 +25,17 @@ enum wlr_drm_output_state { DRM_OUTPUT_CONNECTED, }; -struct wlr_drm_output { +struct wlr_output_mode_state { + struct wlr_wl_output_mode *wlr_mode; + drmModeModeInfo mode; +}; + +struct wlr_output_state { + struct wlr_output *wlr_output; enum wlr_drm_output_state state; uint32_t connector; char name[16]; - size_t num_modes; - struct wlr_drm_mode *modes; - struct wlr_drm_mode *active_mode; - uint32_t width; uint32_t height; @@ -49,7 +50,7 @@ struct wlr_drm_output { bool cleanup; }; -void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore); +void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore); void wlr_drm_scan_connectors(struct wlr_backend_state *state); int wlr_drm_event(int fd, uint32_t mask, void *data); diff --git a/include/wayland.h b/include/wayland.h new file mode 100644 index 00000000..68817936 --- /dev/null +++ b/include/wayland.h @@ -0,0 +1,18 @@ +#ifndef _WLR_WAYLAND_INTERNAL_H +#define _WLR_WAYLAND_INTERNAL_H + +#include +#include +#include + +struct wlr_output_impl { + bool (*set_mode)(struct wlr_output_state *state, struct wlr_output_mode *mode); + void (*destroy)(struct wlr_output_state *state); +}; + +struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, + struct wlr_output_state *state); + +void wlr_output_free(struct wlr_output *output); + +#endif diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 88a5c8e9..b424c29f 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -13,7 +13,6 @@ struct wlr_backend { struct { struct wl_signal output_add; struct wl_signal output_remove; - struct wl_signal output_frame; struct wl_signal keyboard_add; struct wl_signal keyboard_remove; struct wl_signal pointer_add; diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 5db9b35c..2d9bf879 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -5,26 +5,12 @@ #include #include #include // drmModeModeInfo - -struct wlr_drm_backend; -struct wlr_drm_output; - -struct wlr_drm_mode { - uint16_t width; - uint16_t height; - uint32_t rate; - drmModeModeInfo mode; -}; +#include struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_session *session); -const char *wlr_drm_output_get_name(struct wlr_drm_output *out); - -struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count); -bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode); - -void wlr_drm_output_begin(struct wlr_drm_output *out); -void wlr_drm_output_end(struct wlr_drm_output *out); +void wlr_drm_output_begin(struct wlr_output *out); +void wlr_drm_output_end(struct wlr_output *out); #endif diff --git a/include/wlr/wayland.h b/include/wlr/wayland.h index bbbd2457..158acc33 100644 --- a/include/wlr/wayland.h +++ b/include/wlr/wayland.h @@ -3,26 +3,26 @@ #include #include +#include -struct wlr_wl_seat { - struct wl_seat *wl_seat; - uint32_t capabilities; - char *name; - list_t *keyboards; - list_t *pointers; -}; - -void wlr_wl_seat_free(struct wlr_wl_seat *seat); +struct wlr_output_mode_state; -struct wlr_wl_output_mode { +struct wlr_output_mode { + struct wlr_output_mode_state *state; uint32_t flags; // enum wl_output_mode int32_t width, height; int32_t refresh; // mHz }; -struct wlr_wl_output { - struct wl_output *wl_output; +struct wlr_output_impl; +struct wlr_output_state; + +struct wlr_output { + const struct wlr_output_impl *impl; + struct wlr_output_state *state; + uint32_t flags; + char *name; char *make; char *model; uint32_t scale; @@ -30,20 +30,15 @@ struct wlr_wl_output { int32_t phys_width, phys_height; // mm int32_t subpixel; // enum wl_output_subpixel int32_t transform; // enum wl_output_transform - list_t *modes; - struct wlr_wl_output_mode *current_mode; -}; -void wlr_wl_output_free(struct wlr_wl_output *output); + list_t *modes; + struct wlr_output_mode *current_mode; -struct wlr_wl_keyboard { - struct wl_keyboard *wl_keyboard; + struct { + struct wl_signal frame; + } events; }; -struct wlr_wl_pointer { - struct wl_pointer *wl_pointer; - struct wl_surface *current_surface; - wl_fixed_t x, y; -}; +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); #endif diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt index be4a00de..675a7bd2 100644 --- a/wayland/CMakeLists.txt +++ b/wayland/CMakeLists.txt @@ -4,8 +4,7 @@ include_directories( ) add_library(wlr-wayland - types/wlr_wl_seat.c - types/wlr_wl_output.c + types/wlr_output.c ) target_link_libraries(wlr-wayland diff --git a/wayland/types/wlr_output.c b/wayland/types/wlr_output.c new file mode 100644 index 00000000..bc093c00 --- /dev/null +++ b/wayland/types/wlr_output.c @@ -0,0 +1,31 @@ +#include +#include +#include "wlr/wayland.h" +#include "wlr/common/list.h" +#include "wayland.h" + +struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, + struct wlr_output_state *state) { + struct wlr_output *output = calloc(1, sizeof(struct wlr_output)); + output->impl = impl; + output->state = state; + output->modes = list_create(); + wl_signal_init(&output->events.frame); + return output; +} + +void wlr_output_free(struct wlr_output *output) { + if (!output) return; + if (output->make) free(output->make); + if (output->model) free(output->model); + for (size_t i = 0; output->modes && i < output->modes->length; ++i) { + free(output->modes->items[i]); + } + list_free(output->modes); + output->impl->destroy(output->state); + free(output); +} + +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode) { + return output->impl->set_mode(output->state, mode); +} diff --git a/wayland/types/wlr_wl_output.c b/wayland/types/wlr_wl_output.c deleted file mode 100644 index 32aaf070..00000000 --- a/wayland/types/wlr_wl_output.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include -#include "wlr/wayland.h" -#include "wlr/common/list.h" - -void wlr_wl_output_free(struct wlr_wl_output *output) { - if (!output) return; - if (output->wl_output) wl_output_destroy(output->wl_output); - if (output->make) free(output->make); - if (output->model) free(output->model); - for (size_t i = 0; output->modes && i < output->modes->length; ++i) { - free(output->modes->items[i]); - } - list_free(output->modes); - free(output); -} diff --git a/wayland/types/wlr_wl_seat.c b/wayland/types/wlr_wl_seat.c deleted file mode 100644 index a5ef3853..00000000 --- a/wayland/types/wlr_wl_seat.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include -#include "wlr/wayland.h" -#include "wlr/common/list.h" - -void wlr_wl_seat_free(struct wlr_wl_seat *seat) { - if (!seat) return; - if (seat->wl_seat) wl_seat_destroy(seat->wl_seat); - if (seat->name) free(seat->name); - if (seat->keyboards) { - // TODO: free children - list_free(seat->keyboards); - } - if (seat->pointers) { - // TODO: free children - list_free(seat->keyboards); - } - free(seat); -}