mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Continue wayland backend update

Browse source 
Update wayland backend to new api.
Start to use the input interfaces.
Compiling now, not tested.
This commit is contained in:
nyorain 2017-06-19 19:05:10 +02:00
parent 41a477375c
commit 8fbf1ca3ff
5 changed files with 157 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

33
backend/wayland/wl_output.c
View file

@ -4,23 +4,27 @@
#include <stdlib.h>
#include <stdint.h>
#include <wayland-client.h>
#include <wlr/types.h>
#include "types.h"
#include "backend/wayland.h"
#include "common/log.h"
static void wl_output_handle_mode(void *data, struct wl_output *wl_output,
uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
struct wlr_wl_output *output = data;
assert(output->wl_output == wl_output);
struct wlr_wl_output_mode *mode;
if (!(mode = calloc(sizeof(struct wlr_wl_output_mode), 1))) {
wlr_log(L_ERROR, "Failed to allocate wlr_wl_output_mode");
struct wlr_output *output = data;
assert(output->state->output == wl_output);
struct wlr_output_mode *mode;
if (!(mode = calloc(sizeof(struct wlr_output_mode), 1))) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return;
}
mode->flags = flags;
mode->width = width;
mode->height = height;
mode->refresh = refresh;
list_add(output->modes, mode);
wlr_log(L_DEBUG, "Got mode for output %p: %dx%d @ %.2fHz%s%s",
wl_output, width, height, refresh / 1000.0,
(flags & WL_OUTPUT_MODE_PREFERRED) ? " (preferred)" : "",
@ -30,15 +34,18 @@ static void wl_output_handle_mode(void *data, struct wl_output *wl_output,
static void wl_output_handle_geometry(void *data, struct wl_output *wl_output,
int32_t x, int32_t y, int32_t physical_width, int32_t physical_height,
int32_t subpixel, const char *make, const char *model, int32_t transform) {
struct wlr_wl_output *output = data;
assert(output->wl_output == wl_output);
output->x = x;
output->y = y;
struct wlr_output *output = data;
assert(output->state->output == wl_output);
// TODO
// output->x = x;
// output->y = y;
output->phys_width = physical_width;
output->phys_height = physical_height;
output->subpixel = subpixel;
output->make = strdup(make);
output->model = strdup(model);
strncpy(output->make, make, sizeof(output->make));
strncpy(output->model, model, sizeof(output->model));
output->transform = transform;
wlr_log(L_DEBUG, "Got info for output %p %dx%d (%dmm x %dmm) %s %s",
wl_output, (int)x, (int)y, (int)physical_width, (int)physical_height,
@ -46,8 +53,8 @@ static void wl_output_handle_geometry(void *data, struct wl_output *wl_output,
}
static void wl_output_handle_scale(void *data, struct wl_output *wl_output, int32_t factor) {
struct wlr_wl_output *output = data;
assert(output->wl_output == wl_output);
struct wlr_output *output = data;
assert(output->state->output == wl_output);
output->scale = factor;
wlr_log(L_DEBUG, "Got scale factor for output %p: %d", wl_output, factor);
}