hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-04 20:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #114 from martinetd/cleanups

Browse source 
Cleanups
This commit is contained in:
Drew DeVault 2017-08-19 08:45:44 -04:00 committed by GitHub
commit b876bea288
23 changed files with 110 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/drm/drm.c
View file

@ -598,12 +598,12 @@ static bool wlr_drm_output_set_cursor(struct wlr_output *_output,
wlr_matrix_texture(plane->matrix, plane->width, plane->height,
output->output.transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180);
plane->wlr_rend = wlr_gles2_renderer_init(&backend->backend);
plane->wlr_rend = wlr_gles2_renderer_create(&backend->backend);
if (!plane->wlr_rend) {
return false;
}
plane->wlr_tex = wlr_render_texture_init(plane->wlr_rend);
plane->wlr_tex = wlr_render_texture_create(plane->wlr_rend);
if (!plane->wlr_tex) {
return false;
}

1
backend/libinput/backend.c
View file

@ -109,6 +109,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
list_free(wlr_devices);
}
list_free(backend->wlr_device_lists);
wl_event_source_remove(backend->input_event);
libinput_unref(backend->libinput_context);
free(backend);
}

1
backend/wayland/backend.c
View file

@ -88,6 +88,7 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
list_free(backend->outputs);
free(backend->seat_name);
wl_event_source_remove(backend->remote_display_src);
wlr_egl_free(&backend->egl);
if (backend->seat) wl_seat_destroy(backend->seat);
if (backend->shm) wl_shm_destroy(backend->shm);

1
backend/wayland/output.c
View file

@ -224,7 +224,6 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
wlr_output->width = 640;
wlr_output->height = 480;
wlr_output->scale = 1;
strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make));
strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model));
snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%zd",

12
examples/compositor/main.c
View file

@ -147,7 +147,7 @@ int main() {
};
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
@ -178,9 +178,13 @@ int main() {
break;
}
compositor_run(&compositor);
wl_display_run(compositor.display);
wlr_wl_shell_destroy(state.wl_shell);
wlr_xdg_shell_v6_destroy(state.xdg_shell);
close(state.keymap_fd);
wlr_seat_destroy(state.wl_seat);
wlr_data_device_manager_destroy(state.data_device_manager);
wlr_xdg_shell_v6_destroy(state.xdg_shell);
wlr_wl_shell_destroy(state.wl_shell);
wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
}

7
examples/output-layout.c
View file

@ -193,15 +193,16 @@ int main(int argc, char *argv[]) {
compositor.keyboard_key_cb = handle_keyboard_key;
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend);
state.cat_texture = wlr_render_texture_init(state.renderer);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
state.cat_texture = wlr_render_texture_create(state.renderer);
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888,
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
compositor_run(&compositor);
wl_display_run(compositor.display);
wlr_texture_destroy(state.cat_texture);
wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
wlr_output_layout_destroy(state.layout);

3
examples/pointer.c
View file

@ -146,7 +146,8 @@ int main(int argc, char *argv[]) {
}
compositor_init(&compositor);
compositor_run(&compositor);
wl_display_run(compositor.display);
compositor_fini(&compositor);
wlr_xcursor_theme_destroy(theme);
}

7
examples/rotation.c
View file

@ -132,12 +132,12 @@ int main(int argc, char *argv[]) {
compositor.keyboard_key_cb = handle_keyboard_key;
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
}
state.cat_texture = wlr_render_texture_init(state.renderer);
state.cat_texture = wlr_render_texture_create(state.renderer);
if (!state.cat_texture) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
@ -145,10 +145,11 @@ int main(int argc, char *argv[]) {
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888,
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
compositor_run(&compositor);
wl_display_run(compositor.display);
wlr_texture_destroy(state.cat_texture);
wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
example_config_destroy(state.config);
}

3
examples/shared.c
View file

@ -674,8 +674,7 @@ void compositor_init(struct compositor_state *state) {
}
}
void compositor_run(struct compositor_state *state) {
wl_display_run(state->display);
void compositor_fini(struct compositor_state *state) {
wlr_backend_destroy(state->backend);
wl_display_destroy(state->display);
}

2
examples/shared.h
View file

@ -151,6 +151,6 @@ struct compositor_state {
};
void compositor_init(struct compositor_state *state);
void compositor_run(struct compositor_state *state);
void compositor_fini(struct compositor_state *state);
#endif

3
examples/simple.c
View file

@ -52,5 +52,6 @@ int main() {
.output_frame_cb = handle_output_frame,
};
compositor_init(&compositor);
compositor_run(&compositor);
wl_display_run(compositor.display);
compositor_fini(&compositor);
}

5
examples/tablet.c
View file

@ -153,12 +153,13 @@ int main(int argc, char *argv[]) {
};
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
}
compositor_run(&compositor);
wl_display_run(compositor.display);
wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
}

7
examples/touch.c
View file

@ -107,12 +107,12 @@ int main(int argc, char *argv[]) {
};
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
}
state.cat_texture = wlr_render_texture_init(state.renderer);
state.cat_texture = wlr_render_texture_create(state.renderer);
if (!state.cat_texture) {
wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE);
@ -120,8 +120,9 @@ int main(int argc, char *argv[]) {
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ARGB8888,
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);
compositor_run(&compositor);
wl_display_run(compositor.display);
wlr_texture_destroy(state.cat_texture);
wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
}

2
include/render/gles2.h
View file

@ -49,7 +49,7 @@ extern struct shaders shaders;
const struct pixel_format *gl_format_for_wl_format(enum wl_shm_format fmt);
struct wlr_texture *gles2_texture_init();
struct wlr_texture *gles2_texture_create();
extern const GLchar quad_vertex_src[];
extern const GLchar quad_fragment_src[];

2
include/wlr/render.h
View file

@ -12,7 +12,7 @@ void wlr_renderer_end(struct wlr_renderer *r);
/**
* Requests a texture handle from this renderer.
*/
struct wlr_texture *wlr_render_texture_init(struct wlr_renderer *r);
struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r);
/**
* Renders the requested texture using the provided matrix. A typical texture
* rendering goes like so:

2
include/wlr/render/gles2.h
View file

@ -4,6 +4,6 @@
#include <wlr/backend.h>
struct wlr_egl;
struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend);
struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend);
#endif

2
include/wlr/render/interface.h
View file

@ -14,7 +14,7 @@ struct wlr_renderer {
struct wlr_renderer_impl {
void (*begin)(struct wlr_renderer *renderer, struct wlr_output *output);
void (*end)(struct wlr_renderer *renderer);
struct wlr_texture *(*texture_init)(struct wlr_renderer *renderer);
struct wlr_texture *(*texture_create)(struct wlr_renderer *renderer);
bool (*render_with_matrix)(struct wlr_renderer *renderer,
struct wlr_texture *texture, const float (*matrix)[16]);
void (*render_quad)(struct wlr_renderer *renderer,

8
render/gles2/renderer.c
View file

@ -143,11 +143,11 @@ static void wlr_gles2_end(struct wlr_renderer *renderer) {
// no-op
}
static struct wlr_texture *wlr_gles2_texture_init(
static struct wlr_texture *wlr_gles2_texture_create(
struct wlr_renderer *_renderer) {
struct wlr_gles2_renderer *renderer =
(struct wlr_gles2_renderer *)_renderer;
return gles2_texture_init(renderer->egl);
return gles2_texture_create(renderer->egl);
}
static void draw_quad() {
@ -231,7 +231,7 @@ static bool wlr_gles2_buffer_is_drm(struct wlr_renderer *_renderer,
static struct wlr_renderer_impl wlr_renderer_impl = {
.begin = wlr_gles2_begin,
.end = wlr_gles2_end,
.texture_init = wlr_gles2_texture_init,
.texture_create = wlr_gles2_texture_create,
.render_with_matrix = wlr_gles2_render_texture,
.render_quad = wlr_gles2_render_quad,
.render_ellipse = wlr_gles2_render_ellipse,
@ -239,7 +239,7 @@ static struct wlr_renderer_impl wlr_renderer_impl = {
.buffer_is_drm = wlr_gles2_buffer_is_drm,
};
struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend) {
struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend) {
init_globals();
struct wlr_gles2_renderer *renderer;
if (!(renderer = calloc(1, sizeof(struct wlr_gles2_renderer)))) {

2
render/gles2/texture.c
View file

@ -276,7 +276,7 @@ static struct wlr_texture_impl wlr_texture_impl = {
.destroy = gles2_texture_destroy,
};
struct wlr_texture *gles2_texture_init(struct wlr_egl *egl) {
struct wlr_texture *gles2_texture_create(struct wlr_egl *egl) {
struct wlr_gles2_texture *texture;
if (!(texture = calloc(1, sizeof(struct wlr_gles2_texture)))) {
return NULL;

4
render/wlr_renderer.c
View file

@ -23,8 +23,8 @@ void wlr_renderer_end(struct wlr_renderer *r) {
r->impl->end(r);
}
struct wlr_texture *wlr_render_texture_init(struct wlr_renderer *r) {
return r->impl->texture_init(r);
struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r) {
return r->impl->texture_create(r);
}
bool wlr_render_with_matrix(struct wlr_renderer *r,

4
types/wlr_output.c
View file

@ -139,14 +139,14 @@ bool wlr_output_set_cursor(struct wlr_output *output,
if (!output->cursor.renderer) {
/* NULL egl is okay given that we are only using pixel buffers */
output->cursor.renderer = wlr_gles2_renderer_init(NULL);
output->cursor.renderer = wlr_gles2_renderer_create(NULL);
if (!output->cursor.renderer) {
return false;
}
}
if (!output->cursor.texture) {
output->cursor.texture = wlr_render_texture_init(output->cursor.renderer);
output->cursor.texture = wlr_render_texture_create(output->cursor.renderer);
if (!output->cursor.texture) {
return false;
}

6
types/wlr_region.c
View file

@ -26,9 +26,9 @@ static void region_destroy(struct wl_client *client, struct wl_resource *resourc
}
static const struct wl_region_interface region_interface = {
region_destroy,
region_add,
region_subtract,
.destroy = region_destroy,
.add = region_add,
.subtract = region_subtract,
};
static void destroy_region(struct wl_resource *resource) {

87
types/wlr_surface.c
View file

@ -67,6 +67,9 @@ static void surface_set_opaque_region(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *region_resource) {
struct wlr_surface *surface = wl_resource_get_user_data(resource);
if ((surface->pending.invalid & WLR_SURFACE_INVALID_OPAQUE_REGION)) {
pixman_region32_clear(&surface->pending.opaque);
}
surface->pending.invalid |= WLR_SURFACE_INVALID_OPAQUE_REGION;
if (region_resource) {
pixman_region32_t *region = wl_resource_get_user_data(region_resource);
@ -80,12 +83,14 @@ static void surface_set_input_region(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *region_resource) {
struct wlr_surface *surface = wl_resource_get_user_data(resource);
if ((surface->pending.invalid & WLR_SURFACE_INVALID_INPUT_REGION)) {
pixman_region32_clear(&surface->pending.input);
}
surface->pending.invalid |= WLR_SURFACE_INVALID_INPUT_REGION;
if (region_resource) {
pixman_region32_t *region = wl_resource_get_user_data(region_resource);
pixman_region32_copy(&surface->pending.input, region);
} else {
pixman_region32_fini(&surface->pending.input);
pixman_region32_init_rect(&surface->pending.input,
INT32_MIN, INT32_MIN, UINT32_MAX, UINT32_MAX);
}
@ -199,20 +204,30 @@ static void wlr_surface_to_buffer_region(struct wlr_surface *surface,
static void surface_commit(struct wl_client *client,
struct wl_resource *resource) {
struct wlr_surface *surface = wl_resource_get_user_data(resource);
surface->current.scale = surface->pending.scale;
surface->current.transform = surface->pending.transform;
bool update_size = false;
bool update_damage = false;
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SCALE)) {
surface->current.scale = surface->pending.scale;
update_size = true;
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_TRANSFORM)) {
surface->current.transform = surface->pending.transform;
update_size = true;
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_BUFFER)) {
surface->current.buffer = surface->pending.buffer;
update_size = true;
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) {
if (update_size) {
int32_t oldw = surface->current.buffer_width;
int32_t oldh = surface->current.buffer_height;
wlr_surface_update_size(surface);
surface->reupload_buffer = oldw != surface->current.buffer_width ||
oldh != surface->current.buffer_height;
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) {
pixman_region32_union(&surface->current.surface_damage,
&surface->current.surface_damage,
&surface->pending.surface_damage);
@ -220,25 +235,38 @@ static void surface_commit(struct wl_client *client,
&surface->current.surface_damage, 0, 0, surface->current.width,
surface->current.height);
pixman_region32_clear(&surface->pending.surface_damage);
update_damage = true;
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_BUFFER_DAMAGE)) {
pixman_region32_union(&surface->current.buffer_damage,
&surface->current.buffer_damage,
&surface->pending.buffer_damage);
pixman_region32_clear(&surface->pending.buffer_damage);
update_damage = true;
}
if (update_damage) {
pixman_region32_t buffer_damage;
pixman_region32_init(&buffer_damage);
wlr_surface_to_buffer_region(surface, &surface->current.surface_damage,
&buffer_damage, surface->current.width, surface->current.height);
pixman_region32_union(&surface->current.buffer_damage,
&surface->current.buffer_damage, &buffer_damage);
pixman_region32_fini(&buffer_damage);
pixman_region32_intersect_rect(&surface->current.buffer_damage,
&surface->current.buffer_damage, 0, 0,
surface->current.buffer_width, surface->current.buffer_height);
pixman_region32_clear(&surface->pending.surface_damage);
pixman_region32_clear(&surface->pending.buffer_damage);
}
// TODO: Commit other changes
if ((surface->pending.invalid & WLR_SURFACE_INVALID_OPAQUE_REGION)) {
// TODO: process buffer
pixman_region32_clear(&surface->pending.opaque);
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_INPUT_REGION)) {
// TODO: process buffer
pixman_region32_clear(&surface->pending.input);
}
surface->pending.invalid = 0;
// TODO: add the invalid bitfield to this callback
@ -286,11 +314,8 @@ void wlr_surface_flush_damage(struct wlr_surface *surface) {
}
release:
pixman_region32_fini(&surface->current.surface_damage);
pixman_region32_init(&surface->current.surface_damage);
pixman_region32_fini(&surface->current.buffer_damage);
pixman_region32_init(&surface->current.buffer_damage);
pixman_region32_clear(&surface->current.surface_damage);
pixman_region32_clear(&surface->current.buffer_damage);
wl_resource_post_event(surface->current.buffer, WL_BUFFER_RELEASE);
surface->current.buffer = NULL;
@ -299,6 +324,7 @@ release:
static void surface_set_buffer_transform(struct wl_client *client,
struct wl_resource *resource, int transform) {
struct wlr_surface *surface = wl_resource_get_user_data(resource);
surface->pending.invalid |= WLR_SURFACE_INVALID_TRANSFORM;
surface->pending.transform = transform;
}
@ -306,6 +332,7 @@ static void surface_set_buffer_scale(struct wl_client *client,
struct wl_resource *resource,
int32_t scale) {
struct wlr_surface *surface = wl_resource_get_user_data(resource);
surface->pending.invalid |= WLR_SURFACE_INVALID_SCALE;
surface->pending.scale = scale;
}
@ -317,23 +344,23 @@ static void surface_damage_buffer(struct wl_client *client,
if (width < 0 || height < 0) {
return;
}
surface->pending.invalid |= WLR_SURFACE_INVALID_SURFACE_DAMAGE;
surface->pending.invalid |= WLR_SURFACE_INVALID_BUFFER_DAMAGE;
pixman_region32_union_rect(&surface->pending.buffer_damage,
&surface->pending.buffer_damage,
x, y, width, height);
}
const struct wl_surface_interface surface_interface = {
surface_destroy,
surface_attach,
surface_damage,
surface_frame,
surface_set_opaque_region,
surface_set_input_region,
surface_commit,
surface_set_buffer_transform,
surface_set_buffer_scale,
surface_damage_buffer
.destroy = surface_destroy,
.attach = surface_attach,
.damage = surface_damage,
.frame = surface_frame,
.set_opaque_region = surface_set_opaque_region,
.set_input_region = surface_set_input_region,
.commit = surface_commit,
.set_buffer_transform = surface_set_buffer_transform,
.set_buffer_scale = surface_set_buffer_scale,
.damage_buffer = surface_damage_buffer
};
static void destroy_surface(struct wl_resource *resource) {
@ -344,6 +371,10 @@ static void destroy_surface(struct wl_resource *resource) {
wl_list_for_each_safe(cb, next, &surface->frame_callback_list, link) {
wl_resource_destroy(cb->resource);
}
pixman_region32_fini(&surface->pending.surface_damage);
pixman_region32_fini(&surface->pending.buffer_damage);
pixman_region32_fini(&surface->pending.opaque);
pixman_region32_fini(&surface->pending.input);
free(surface);
}
@ -356,12 +387,16 @@ struct wlr_surface *wlr_surface_create(struct wl_resource *res,
return NULL;
}
surface->renderer = renderer;
surface->texture = wlr_render_texture_init(renderer);
surface->texture = wlr_render_texture_create(renderer);
surface->resource = res;
surface->current.scale = 1;
surface->pending.scale = 1;
surface->current.transform = WL_OUTPUT_TRANSFORM_NORMAL;
surface->pending.transform = WL_OUTPUT_TRANSFORM_NORMAL;
pixman_region32_init(&surface->pending.surface_damage);
pixman_region32_init(&surface->pending.buffer_damage);
pixman_region32_init(&surface->pending.opaque);
pixman_region32_init(&surface->pending.input);
wl_signal_init(&surface->signals.commit);
wl_list_init(&surface->frame_callback_list);
wl_resource_set_implementation(res, &surface_interface,