mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-06 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #91 from martinetd/move_wl_shell

Browse source 
Move wl_shell into wlroots
This commit is contained in:
Drew DeVault 2017-08-15 17:39:18 -04:00 • committed by GitHub
commit 19d6442f52
9 changed files with 117 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

55
examples/compositor/main.c
View file

@ -12,6 +12,7 @@
#include <wlr/render/gles2.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <xkbcommon/xkbcommon.h>
#include <wlr/util/log.h>
@ -21,7 +22,7 @@
struct sample_state {
struct wlr_renderer *renderer;
struct wl_compositor_state compositor;
struct wl_shell_state shell;
struct wlr_wl_shell *wl_shell;
struct wlr_xdg_shell_v6 *xdg_shell;
};
@ -32,6 +33,26 @@ static inline int64_t timespec_to_msec(const struct timespec *a) {
return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
}
void output_frame_handle_surface(struct sample_state *sample,
struct wlr_output *wlr_output, struct timespec *ts,
struct wl_resource *_res) {
struct wlr_surface *surface = wl_resource_get_user_data(_res);
float matrix[16];
float transform[16];
wlr_surface_flush_damage(surface);
if (surface->texture->valid) {
wlr_matrix_translate(&transform, 200, 200, 0);
wlr_surface_get_matrix(surface, &matrix,
&wlr_output->transform_matrix, &transform);
wlr_render_with_matrix(sample->renderer, surface->texture, &matrix);
struct wlr_frame_callback *cb, *cnext;
wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) {
wl_callback_send_done(cb->resource, timespec_to_msec(ts));
wl_resource_destroy(cb->resource);
}
}
}
void handle_output_frame(struct output_state *output, struct timespec *ts) {
struct compositor_state *state = output->compositor;
struct sample_state *sample = state->data;
@ -40,24 +61,13 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
struct wl_resource *_res;
float matrix[16];
float transform[16];
wl_list_for_each(_res, &sample->compositor.surfaces, link) {
struct wlr_surface *surface = wl_resource_get_user_data(_res);
wlr_surface_flush_damage(surface);
if (surface->texture->valid) {
wlr_matrix_translate(&transform, 200, 200, 0);
wlr_surface_get_matrix(surface, &matrix,
&wlr_output->transform_matrix, &transform);
wlr_render_with_matrix(sample->renderer, surface->texture, &matrix);
struct wlr_frame_callback *cb, *cnext;
wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) {
wl_callback_send_done(cb->resource, timespec_to_msec(ts));
wl_resource_destroy(cb->resource);
}
}
struct wlr_wl_shell_surface *wl_shell_surface;
wl_list_for_each(wl_shell_surface, &sample->wl_shell->surfaces, link) {
output_frame_handle_surface(sample, wlr_output, ts, wl_shell_surface->surface);
}
struct wlr_xdg_surface_v6 *xdg_surface;
wl_list_for_each(xdg_surface, &sample->xdg_shell->surfaces, link) {
output_frame_handle_surface(sample, wlr_output, ts, xdg_surface->surface);
}
wlr_renderer_end(sample->renderer);
@ -79,8 +89,11 @@ int main() {
}
wl_display_init_shm(compositor.display);
wl_compositor_init(compositor.display, &state.compositor, state.renderer);
wl_shell_init(compositor.display, &state.shell);
state.xdg_shell = wlr_xdg_shell_v6_init(compositor.display);
state.wl_shell = wlr_wl_shell_create(compositor.display);
state.xdg_shell = wlr_xdg_shell_v6_create(compositor.display);
compositor_run(&compositor);
wlr_wl_shell_destroy(state.wl_shell);
wlr_xdg_shell_v6_destroy(state.xdg_shell);
}

11
examples/compositor/wl_compositor.c
View file

@ -7,16 +7,7 @@
#include "compositor.h"
static void destroy_surface_listener(struct wl_listener *listener, void *data) {
struct wlr_surface *surface = wl_resource_get_user_data(data);
struct wl_compositor_state *state = surface->compositor_data;
struct wl_resource *res = NULL;
wl_list_for_each(res, &state->surfaces, link) {
if (res == surface->resource) {
wl_list_remove(&res->link);
break;
}
}
wl_list_remove(wl_resource_get_link(data));
}
static void wl_compositor_create_surface(struct wl_client *client,

133
examples/compositor/wl_shell.c
View file

@ -1,133 +0,0 @@
#include <assert.h>
#include <wayland-server.h>
#include <wlr/util/log.h>
#include <stdlib.h>
#include "compositor.h"
static void shell_surface_pong(struct wl_client *client, struct wl_resource
*resource, uint32_t serial) {
wlr_log(L_DEBUG, "TODO: implement shell surface pong");
}
static void shell_surface_move(struct wl_client *client, struct wl_resource
*resource, struct wl_resource *seat, uint32_t serial) {
wlr_log(L_DEBUG, "TODO: implement shell surface move");
}
static void shell_surface_resize(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat, uint32_t serial,
uint32_t edges) {
wlr_log(L_DEBUG, "TODO: implement shell surface resize");
}
static void shell_surface_set_toplevel(struct wl_client *client,
struct wl_resource *resource) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_toplevel");
}
static void shell_surface_set_transient(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *parent, int32_t x,
int32_t y, uint32_t flags) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_transient");
}
static void shell_surface_set_fullscreen(struct wl_client *client,
struct wl_resource *resource, uint32_t method, uint32_t framerate,
struct wl_resource *output) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_fullscreen");
}
static void shell_surface_set_popup(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat, uint32_t serial,
struct wl_resource *parent, int32_t x, int32_t y, uint32_t flags) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_popup");
}
static void shell_surface_set_maximized(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *output) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_maximized");
}
static void shell_surface_set_title(struct wl_client *client,
struct wl_resource *resource, const char *title) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_title");
}
static void shell_surface_set_class(struct wl_client *client,
struct wl_resource *resource, const char *class_) {
wlr_log(L_DEBUG, "TODO: implement shell surface set_class");
}
struct wl_shell_surface_interface shell_surface_interface = {
.pong = shell_surface_pong,
.move = shell_surface_move,
.resize = shell_surface_resize,
.set_toplevel = shell_surface_set_toplevel,
.set_transient = shell_surface_set_transient,
.set_fullscreen = shell_surface_set_fullscreen,
.set_popup = shell_surface_set_popup,
.set_maximized = shell_surface_set_maximized,
.set_title = shell_surface_set_title,
.set_class = shell_surface_set_class,
};
struct shell_surface_state {
struct wlr_texture *wlr_texture;
};
static void destroy_shell_surface(struct wl_resource *resource) {
struct shell_surface_state *state = wl_resource_get_user_data(resource);
free(state);
}
void wl_shell_get_shell_surface(struct wl_client *client,
struct wl_resource *resource, uint32_t id,
struct wl_resource *surface) {
struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface);
struct shell_surface_state *state = malloc(sizeof(struct shell_surface_state));
state->wlr_texture = wlr_texture;
struct wl_resource *shell_surface_resource = wl_resource_create(client,
&wl_shell_surface_interface, wl_resource_get_version(resource), id);
wl_resource_set_implementation(shell_surface_resource,
&shell_surface_interface, state, destroy_shell_surface);
}
static struct wl_shell_interface wl_shell_impl = {
.get_shell_surface = wl_shell_get_shell_surface
};
static void wl_shell_destroy(struct wl_resource *resource) {
struct wl_shell_state *state = wl_resource_get_user_data(resource);
struct wl_resource *_resource = NULL;
wl_resource_for_each(_resource, &state->wl_resources) {
if (_resource == resource) {
struct wl_list *link = wl_resource_get_link(_resource);
wl_list_remove(link);
break;
}
}
}
static void wl_shell_bind(struct wl_client *wl_client, void *_state,
uint32_t version, uint32_t id) {
struct wl_shell_state *state = _state;
assert(wl_client && state);
if (version > 1) {
wlr_log(L_ERROR, "Client requested unsupported wl_shell version, disconnecting");
wl_client_destroy(wl_client);
return;
}
struct wl_resource *wl_resource = wl_resource_create(
wl_client, &wl_shell_interface, version, id);
wl_resource_set_implementation(wl_resource, &wl_shell_impl,
state, wl_shell_destroy);
wl_list_insert(&state->wl_resources, wl_resource_get_link(wl_resource));
}
void wl_shell_init(struct wl_display *display,
struct wl_shell_state *state) {
struct wl_global *wl_global = wl_global_create(display,
&wl_shell_interface, 1, state, wl_shell_bind);
state->wl_global = wl_global;
wl_list_init(&state->wl_resources);
}