blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #966 from emersion/xdg-output-2 

Add support for version 2 of the xdg-output protocol
This commit is contained in:
emersion 2018-05-17 09:21:17 +01:00 committed by GitHub
parent f1fcc685b6 63fd2203fe
commit ec6e56a314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -49,7 +49,7 @@ add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl') wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols', version: '>=1.12') wayland_protos = dependency('wayland-protocols', version: '>=1.14')
egl = dependency('egl') egl = dependency('egl')
glesv2 = dependency('glesv2') glesv2 = dependency('glesv2')
drm = dependency('libdrm') drm = dependency('libdrm')

20
types/wlr_xdg_output.c
View File

@ -1,5 +1,6 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_xdg_output.h> #include <wlr/types/wlr_xdg_output.h>
@ -23,11 +24,25 @@ static void output_handle_resource_destroy(struct wl_resource *resource) {
static void output_send_details(struct wl_resource *resource, static void output_send_details(struct wl_resource *resource,
struct wlr_output_layout_output *layout_output) { struct wlr_output_layout_output *layout_output) {
struct wlr_output *output = layout_output->output;
zxdg_output_v1_send_logical_position(resource, zxdg_output_v1_send_logical_position(resource,
layout_output->x, layout_output->y); layout_output->x, layout_output->y);
int width, height; int width, height;
wlr_output_effective_resolution(layout_output->output, &width, &height); wlr_output_effective_resolution(layout_output->output, &width, &height);
zxdg_output_v1_send_logical_size(resource, width, height); zxdg_output_v1_send_logical_size(resource, width, height);
uint32_t version = wl_resource_get_version(resource);
if (version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
zxdg_output_v1_send_name(resource, output->name);
}
if (version >= ZXDG_OUTPUT_V1_DESCRIPTION_SINCE_VERSION) {
char description[128];
snprintf(description, sizeof(description), "%s %s %s (%s)",
output->make, output->model, output->serial, output->name);
zxdg_output_v1_send_description(resource, description);
}
zxdg_output_v1_send_done(resource); zxdg_output_v1_send_done(resource);
} }
@ -173,12 +188,11 @@ struct wlr_xdg_output_manager *wlr_xdg_output_manager_create(
} }
manager->layout = layout; manager->layout = layout;
manager->global = wl_global_create(display, manager->global = wl_global_create(display,
&zxdg_output_manager_v1_interface, &zxdg_output_manager_v1_interface, OUTPUT_MANAGER_VERSION, manager,
OUTPUT_MANAGER_VERSION, manager, output_manager_bind); output_manager_bind);
if (!manager->global) { if (!manager->global) {
free(manager); free(manager);
return NULL; return NULL;
} }
wl_list_init(&manager->resources); wl_list_init(&manager->resources);