itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generalize output handling

Browse Source
master
Drew DeVault 8 years ago
parent 15b1ce9e6c
commit 00931f2f8f
16 changed files with 405 additions and 442 deletions
Show Stats Download Patch File Download Diff File

8
backend/CMakeLists.txt
Unescape View File

@ -5,10 +5,10 @@ include_directories(
) )
add_library(wlr-backend add_library(wlr-backend
wayland/backend.c #wayland/backend.c
wayland/registry.c #wayland/registry.c
wayland/wl_seat.c #wayland/wl_seat.c
wayland/wl_output.c #wayland/wl_output.c
drm/backend.c drm/backend.c
drm/drm.c drm/drm.c
drm/udev.c drm/udev.c

3
backend/backend.c
Unescape View File

@ -16,7 +16,6 @@ struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
backend->impl = impl; backend->impl = impl;
wl_signal_init(&backend->events.output_add); wl_signal_init(&backend->events.output_add);
wl_signal_init(&backend->events.output_remove); 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_add);
wl_signal_init(&backend->events.keyboard_remove); wl_signal_init(&backend->events.keyboard_remove);
wl_signal_init(&backend->events.pointer_add); 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) { void wlr_backend_destroy(struct wlr_backend *backend) {
backend->impl->destroy(backend->state); backend->impl->destroy(backend->state);
// TODO: Free anything else? // TODO: free outputs
free(backend); free(backend);
} }

11
backend/drm/backend.c
Unescape View File

@ -19,18 +19,11 @@ static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
return true; 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) { static void wlr_drm_backend_destroy(struct wlr_backend_state *state) {
if (!state) { if (!state) {
return; return;
} }
list_foreach(state->outputs, free_output); // TODO: free outputs in shared backend code
list_free(state->outputs);
wlr_drm_renderer_free(&state->renderer); wlr_drm_renderer_free(&state->renderer);
wlr_udev_free(&state->udev); wlr_udev_free(&state->udev);
wlr_session_close_file(state->session, state->fd); 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; 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)) { if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {
wlr_log(L_ERROR, "Failed to initialize renderer"); wlr_log(L_ERROR, "Failed to initialize renderer");
goto error_event; goto error_event;

383
backend/drm/drm.c
Unescape View File

@ -13,6 +13,7 @@
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#include <wayland-server.h> #include <wayland-server.h>
#include "wayland.h"
#include "backend.h" #include "backend.h"
#include "backend/drm/backend.h" #include "backend/drm/backend.h"
#include "backend/drm/drm.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) { bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
renderer->gbm = gbm_create_device(fd); renderer->gbm = gbm_create_device(fd);
if (!renderer->gbm) { if (!renderer->gbm) {
wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno)); 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) { if (!renderer) {
return; return;
} }
wlr_egl_free(&renderer->egl); wlr_egl_free(&renderer->egl);
gbm_device_destroy(renderer->gbm); gbm_device_destroy(renderer->gbm);
} }
@ -95,262 +94,272 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) {
return *id; return *id;
} }
void wlr_drm_output_begin(struct wlr_drm_output *out) { void wlr_drm_output_begin(struct wlr_output *output) {
struct wlr_drm_renderer *renderer = out->renderer; struct wlr_output_state *_output = output->state;
eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); 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) { void wlr_drm_output_end(struct wlr_output *output) {
struct wlr_drm_renderer *renderer = out->renderer; struct wlr_output_state *_output = output->state;
eglSwapBuffers(renderer->egl.display, out->egl); 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); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
drmModePageFlip(renderer->fd, _output->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, _output);
drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); gbm_surface_release_buffer(_output->gbm, bo);
_output->pageflip_pending = true;
gbm_surface_release_buffer(out->gbm, bo);
out->pageflip_pending = true;
} }
static bool display_init_renderer(struct wlr_drm_renderer *renderer, static bool display_init_renderer(struct wlr_drm_renderer *renderer,
struct wlr_drm_output *out) { struct wlr_output_state *output) {
struct wlr_output_mode *mode = output->wlr_output->current_mode;
out->renderer = renderer; output->renderer = renderer;
output->gbm = gbm_surface_create(renderer->gbm, mode->width,
out->gbm = gbm_surface_create(renderer->gbm, out->width, out->height, mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); if (!output->gbm) {
if (!out->gbm) { wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->name,
wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", out->name,
strerror(errno)); strerror(errno));
return false; return false;
} }
out->egl = wlr_egl_create_surface(&renderer->egl, out->gbm); output->egl = wlr_egl_create_surface(&renderer->egl, output->gbm);
if (out->egl == EGL_NO_SURFACE) { if (output->egl == EGL_NO_SURFACE) {
wlr_log(L_ERROR, "Failed to create EGL surface for %s", out->name); wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->name);
return false; return false;
} }
// Render black frame // 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, output->width, output->height);
glViewport(0, 0, out->width, out->height);
glClearColor(0.0, 0.0, 0.0, 1.0); glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT); 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); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
drmModeSetCrtc(renderer->fd, out->crtc, fb_id, 0, 0, drmModeSetCrtc(renderer->fd, output->crtc, fb_id, 0, 0,
&out->connector, 1, &out->active_mode->mode); &output->connector, 1, &mode->state->mode);
drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); drmModePageFlip(renderer->fd, output->crtc, fb_id,
DRM_MODE_PAGE_FLIP_EVENT, output);
gbm_surface_release_buffer(out->gbm, bo);
gbm_surface_release_buffer(output->gbm, bo);
return true; return true;
} }
static int find_id(const void *item, const void *cmp_to) { 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; const uint32_t *id = cmp_to;
if (out->connector < *id) { if (output->connector < *id) {
return -1; return -1;
} else if (out->connector > *id) { } else if (output->connector > *id) {
return 1; return 1;
} else { } else {
return 0; return 0;
} }
} }
void wlr_drm_scan_connectors(struct wlr_backend_state *state) { static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
wlr_log(L_INFO, "Scanning DRM connectors"); 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); drmModeRes *res = drmModeGetResources(state->fd);
if (!res) { if (!res) {
wlr_log(L_ERROR, "Failed to get DRM resources"); wlr_log(L_ERROR, "Failed to get DRM resources");
return; goto error;
} }
for (int i = 0; i < res->count_connectors; ++i) { bool success = false;
uint32_t id = res->connectors[i]; for (int i = 0; !success && i < conn->count_encoders; ++i) {
drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]);
drmModeConnector *conn = drmModeGetConnector(state->fd, id); if (!enc) {
if (!conn) {
wlr_log(L_ERROR, "Failed to get DRM connector");
continue; continue;
} }
struct wlr_drm_output *out; for (int j = 0; j < res->count_crtcs; ++j) {
int index = list_seq_find(state->outputs, find_id, &id); if ((enc->possible_crtcs & (1 << j)) == 0) {
if (index == -1) {
out = calloc(1, sizeof(struct wlr_drm_output));
if (!out) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
drmModeFreeConnector(conn);
continue; continue;
} }
out->renderer = &state->renderer; if ((state->taken_crtcs & (1 << j)) == 0) {
out->state = DRM_OUTPUT_DISCONNECTED; state->taken_crtcs |= 1 << j;
out->connector = id; output->crtc = res->crtcs[j];
snprintf(out->name, sizeof out->name, "%s-%"PRIu32, success = true;
conn_name[conn->connector_type], break;
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);
free(curr_enc);
} }
}
list_add(state->outputs, out); drmModeFreeEncoder(enc);
wlr_log(L_INFO, "Found display '%s'", out->name);
} else {
out = state->outputs->items[index];
} }
if (out->state == DRM_OUTPUT_DISCONNECTED && drmModeFreeResources(res);
conn->connection == DRM_MODE_CONNECTED) {
wlr_log(L_INFO, "'%s' connected", out->name);
out->modes = malloc(sizeof(*out->modes) * conn->count_modes); if (!success) {
if (!out->modes) { wlr_log(L_ERROR, "Failed to find CRTC for %s", output->name);
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error; goto error;
} }
wlr_log(L_INFO, "Detected modes:"); output->state = DRM_OUTPUT_CONNECTED;
output->width = mode->width;
out->num_modes = conn->count_modes; output->height = mode->height;
for (int i = 0; i < conn->count_modes; ++i) { output->wlr_output->current_mode = mode;
drmModeModeInfo *mode = &conn->modes[i];
out->modes[i].width = mode->hdisplay;
out->modes[i].height = mode->vdisplay;
// TODO: Calculate more accurate refresh rate
out->modes[i].rate = mode->vrefresh;
out->modes[i].mode = *mode;
wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, if (!display_init_renderer(&state->renderer, output)) {
mode->hdisplay, mode->vdisplay, wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->name);
mode->vrefresh); goto error;
} }
out->state = DRM_OUTPUT_NEEDS_MODESET; drmModeFreeConnector(conn);
wlr_log(L_INFO, "Sending modesetting signal for '%s'", out->name); return true;
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: error:
// TODO: destroy
wlr_drm_output_cleanup(output, false);
drmModeFreeConnector(conn); drmModeFreeConnector(conn);
} return false;
drmModeFreeResources(res);
} }
struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count) { static void wlr_drm_output_destroy(struct wlr_output_state *output) {
if (out->state == DRM_OUTPUT_DISCONNECTED) { wlr_drm_output_cleanup(output, true);
*count = 0; wlr_drm_renderer_free(output->renderer);
return NULL; free(output);
}
*count = out->num_modes;
return out->modes;
} }
bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode) { static struct wlr_output_impl output_impl = {
struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer); .set_mode = wlr_drm_output_set_mode,
.destroy = wlr_drm_output_destroy,
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) { void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
wlr_log(L_ERROR, "%s is not connected", out->name); wlr_log(L_INFO, "Scanning DRM connectors");
goto error;
}
drmModeRes *res = drmModeGetResources(state->fd); drmModeRes *res = drmModeGetResources(state->fd);
if (!res) { if (!res) {
wlr_log(L_ERROR, "Failed to get DRM resources"); wlr_log(L_ERROR, "Failed to get DRM resources");
goto error; return;
} }
bool success = false; for (int i = 0; i < res->count_connectors; ++i) {
for (int i = 0; !success && i < conn->count_encoders; ++i) { uint32_t id = res->connectors[i];
drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]);
if (!enc)
continue;
for (int j = 0; j < res->count_crtcs; ++j) { drmModeConnector *conn = drmModeGetConnector(state->fd, id);
if ((enc->possible_crtcs & (1 << j)) == 0) { if (!conn) {
wlr_log(L_ERROR, "Failed to get DRM connector");
continue; continue;
} }
if ((state->taken_crtcs & (1 << j)) == 0) { struct wlr_output_state *output;
state->taken_crtcs |= 1 << j; struct wlr_output *wlr_output;
out->crtc = res->crtcs[j]; int index = list_seq_find(state->outputs, find_id, &id);
success = true; if (index == -1) {
break; 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);
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return;
} }
drmModeFreeEncoder(enc); 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);
drmModeFreeResources(res); drmModeEncoder *curr_enc = drmModeGetEncoder(state->fd, conn->encoder_id);
if (curr_enc) {
output->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id);
free(curr_enc);
}
if (!success) { list_add(state->outputs, output);
wlr_log(L_ERROR, "Failed to find CRTC for %s", out->name); wlr_log(L_INFO, "Found display '%s'", output->name);
goto error; } else {
output = state->outputs->items[index];
wlr_output = output->wlr_output;
} }
out->state = DRM_OUTPUT_CONNECTED; // TODO: move state into wlr_output
out->active_mode = mode; if (output->state == DRM_OUTPUT_DISCONNECTED &&
out->width = mode->width; conn->connection == DRM_MODE_CONNECTED) {
out->height = mode->height;
if (!display_init_renderer(&state->renderer, out)) { wlr_log(L_INFO, "'%s' connected", output->name);
wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name); wlr_log(L_INFO, "Detected modes:");
goto error;
for (int i = 0; i < conn->count_modes; ++i) {
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
// TODO: Check that this refresh rate is mHz
mode->height = _state->mode.vdisplay;
mode->state = _state;
wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32,
_state->mode.hdisplay, _state->mode.vdisplay,
_state->mode.vrefresh);
list_add(wlr_output->modes, mode);
} }
drmModeFreeConnector(conn); 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) {
return true; wlr_log(L_INFO, "'%s' disconnected", output->name);
// TODO: Destroy
wlr_drm_output_cleanup(output, false);
}
error:
wlr_drm_output_cleanup(out, false);
drmModeFreeConnector(conn); drmModeFreeConnector(conn);
}
return false; drmModeFreeResources(res);
} }
static void page_flip_handler(int fd, unsigned seq, static void page_flip_handler(int fd, unsigned seq,
unsigned tv_sec, unsigned tv_usec, void *user) { unsigned tv_sec, unsigned tv_usec, void *user) {
struct wlr_drm_output *out = user; struct wlr_output_state *output = user;
struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer); struct wlr_backend_state *state =
wl_container_of(output->renderer, state, renderer);
out->pageflip_pending = false; output->pageflip_pending = false;
if (out->state == DRM_OUTPUT_CONNECTED) { if (output->state == DRM_OUTPUT_CONNECTED) {
wl_signal_emit(&state->backend->events.output_frame, out); 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); drmHandleEvent(fd, &event);
return 1; 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 // Wait for any pending pageflips to finish
while (out->pageflip_pending) { while (output->pageflip_pending) {
wlr_drm_event(fd, 0, NULL); wlr_drm_event(fd, 0, NULL);
} }
drmModeCrtc *crtc = out->old_crtc; drmModeCrtc *crtc = output->old_crtc;
if (!crtc) { if (!crtc) {
return; return;
} }
drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y,
&out->connector, 1, &crtc->mode); &output->connector, 1, &crtc->mode);
drmModeFreeCrtc(crtc); drmModeFreeCrtc(crtc);
} }
void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
if (!out) { if (!output) {
return; 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); struct wlr_backend_state *state = wl_container_of(renderer, state, renderer);
switch (out->state) { switch (output->state) {
case DRM_OUTPUT_CONNECTED: case DRM_OUTPUT_CONNECTED:
eglDestroySurface(renderer->egl.display, out->egl); eglDestroySurface(renderer->egl.display, output->egl);
gbm_surface_destroy(out->gbm); gbm_surface_destroy(output->gbm);
output->egl = EGL_NO_SURFACE;
out->egl = EGL_NO_SURFACE; output->gbm = NULL;
out->gbm = NULL;
/* Fallthrough */ /* Fallthrough */
case DRM_OUTPUT_NEEDS_MODESET: case DRM_OUTPUT_NEEDS_MODESET:
free(out->modes); output->state = DRM_OUTPUT_DISCONNECTED;
out->num_modes = 0;
out->modes = NULL;
out->active_mode = NULL;
out->width = 0;
out->height = 0;
out->state = DRM_OUTPUT_DISCONNECTED;
if (restore) { if (restore) {
restore_output(out, renderer->fd); restore_output(output, renderer->fd);
} }
wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->name);
wlr_log(L_INFO, "Emmiting destruction signal for '%s'", out->name); wl_signal_emit(&state->backend->events.output_remove, output->wlr_output);
wl_signal_emit(&state->backend->events.output_remove, out);
break; break;
case DRM_OUTPUT_DISCONNECTED: case DRM_OUTPUT_DISCONNECTED:
break; break;
} }
} // TODO: free wlr_output
const char *wlr_drm_output_get_name(struct wlr_drm_output *out) {
return out->name;
} }

8
example/CMakeLists.txt
Unescape View File

@ -8,13 +8,5 @@ add_executable(example
target_link_libraries(example target_link_libraries(example
wlr-backend wlr-backend
)
add_executable(example-drm
example-drm.c
)
target_link_libraries(example-drm
wlr-backend
wlr-session wlr-session
) )

124
example/example-drm.c
Unescape View File

@ -1,124 +0,0 @@
#define _POSIX_C_SOURCE 199309L
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <wayland-server.h>
#include <GLES3/gl3.h>
#include <wlr/backend/drm.h>
#include <wlr/session.h>
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);
}

142
example/main.c
Unescape View File

@ -1,19 +1,133 @@
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 199309L
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <wlr/backend.h> #include <time.h>
#include <wlr/backend/wayland.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <GLES3/gl3.h>
#include <wlr/backend/drm.h>
#include <wlr/session.h>
#include <wlr/common/list.h>
int main(int argc, char **argv) { struct state {
// TODO: Move this stuff to a wlr backend selector function float color[3];
char *_wl_display = getenv("WAYLAND_DISPLAY"); int dec;
if (_wl_display) { struct timespec last_frame;
unsetenv("WAYLAND_DISPLAY"); struct wl_listener output_add;
setenv("_WAYLAND_DISPLAY", _wl_display, 1); 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); wl_event_source_remove(timer);
wlr_wl_backend_free(backend); wlr_backend_destroy(wlr);
wl_display_destroy(wl_display); wl_display_destroy(display);
return 0;
} }

15
include/backend/drm/drm.h
Unescape View File

@ -12,7 +12,6 @@
struct wlr_drm_renderer { struct wlr_drm_renderer {
int fd; int fd;
struct gbm_device *gbm; struct gbm_device *gbm;
struct wlr_egl egl; struct wlr_egl egl;
}; };
@ -26,15 +25,17 @@ enum wlr_drm_output_state {
DRM_OUTPUT_CONNECTED, 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; enum wlr_drm_output_state state;
uint32_t connector; uint32_t connector;
char name[16]; char name[16];
size_t num_modes;
struct wlr_drm_mode *modes;
struct wlr_drm_mode *active_mode;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
@ -49,7 +50,7 @@ struct wlr_drm_output {
bool cleanup; 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); void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data); int wlr_drm_event(int fd, uint32_t mask, void *data);

18
include/wayland.h
Unescape View File

@ -0,0 +1,18 @@
#ifndef _WLR_WAYLAND_INTERNAL_H
#define _WLR_WAYLAND_INTERNAL_H
#include <wayland-server.h>
#include <wlr/wayland.h>
#include <stdbool.h>
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

1
include/wlr/backend.h
Unescape View File

@ -13,7 +13,6 @@ struct wlr_backend {
struct { struct {
struct wl_signal output_add; struct wl_signal output_add;
struct wl_signal output_remove; struct wl_signal output_remove;
struct wl_signal output_frame;
struct wl_signal keyboard_add; struct wl_signal keyboard_add;
struct wl_signal keyboard_remove; struct wl_signal keyboard_remove;
struct wl_signal pointer_add; struct wl_signal pointer_add;

20
include/wlr/backend/drm.h
Unescape View File

@ -5,26 +5,12 @@
#include <wlr/session.h> #include <wlr/session.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <xf86drmMode.h> // drmModeModeInfo #include <xf86drmMode.h> // drmModeModeInfo
#include <wlr/wayland.h>
struct wlr_drm_backend;
struct wlr_drm_output;
struct wlr_drm_mode {
uint16_t width;
uint16_t height;
uint32_t rate;
drmModeModeInfo mode;
};
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
struct wlr_session *session); struct wlr_session *session);
const char *wlr_drm_output_get_name(struct wlr_drm_output *out); void wlr_drm_output_begin(struct wlr_output *out);
void wlr_drm_output_end(struct wlr_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);
#endif #endif

41
include/wlr/wayland.h
Unescape View File

@ -3,26 +3,26 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/common/list.h> #include <wlr/common/list.h>
#include <stdbool.h>
struct wlr_wl_seat { struct wlr_output_mode_state;
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_wl_output_mode { struct wlr_output_mode {
struct wlr_output_mode_state *state;
uint32_t flags; // enum wl_output_mode uint32_t flags; // enum wl_output_mode
int32_t width, height; int32_t width, height;
int32_t refresh; // mHz int32_t refresh; // mHz
}; };
struct wlr_wl_output { struct wlr_output_impl;
struct wl_output *wl_output; struct wlr_output_state;
struct wlr_output {
const struct wlr_output_impl *impl;
struct wlr_output_state *state;
uint32_t flags; uint32_t flags;
char *name;
char *make; char *make;
char *model; char *model;
uint32_t scale; uint32_t scale;
@ -30,20 +30,15 @@ struct wlr_wl_output {
int32_t phys_width, phys_height; // mm int32_t phys_width, phys_height; // mm
int32_t subpixel; // enum wl_output_subpixel int32_t subpixel; // enum wl_output_subpixel
int32_t transform; // enum wl_output_transform 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 {
struct wl_keyboard *wl_keyboard; struct wl_signal frame;
} events;
}; };
struct wlr_wl_pointer { bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode);
struct wl_pointer *wl_pointer;
struct wl_surface *current_surface;
wl_fixed_t x, y;
};
#endif #endif

3
wayland/CMakeLists.txt
Unescape View File

@ -4,8 +4,7 @@ include_directories(
) )
add_library(wlr-wayland add_library(wlr-wayland
types/wlr_wl_seat.c types/wlr_output.c
types/wlr_wl_output.c
) )
target_link_libraries(wlr-wayland target_link_libraries(wlr-wayland

31
wayland/types/wlr_output.c
Unescape View File

@ -0,0 +1,31 @@
#include <stdlib.h>
#include <wayland-server.h>
#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);
}

16
wayland/types/wlr_wl_output.c
Unescape View File

@ -1,16 +0,0 @@
#include <stdlib.h>
#include <wayland-client.h>
#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);
}

19
wayland/types/wlr_wl_seat.c
Unescape View File

@ -1,19 +0,0 @@
#include <stdlib.h>
#include <wayland-client.h>
#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);
}
Write Preview
Loading…
Cancel
Save