wayland-hwc: Drop dummy window hack & QtMir integration improvements #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright © 2011 Benjamin Franzke | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice (including the next | ||
| * paragraph) shall be included in all copies or substantial portions of the | ||
| * Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * Authors: | ||
| * Benjamin Franzke <[email protected]> | ||
| */ | ||
|
|
||
| #ifndef _WAYLAND_EGL_PRIV_H | ||
| #define _WAYLAND_EGL_PRIV_H | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /* | ||
| * NOTE: This version must be kept in sync with the version field in the | ||
| * wayland-egl-backend pkgconfig file generated in meson.build. | ||
| */ | ||
| #define WL_EGL_WINDOW_VERSION 3 | ||
|
|
||
| struct wl_surface; | ||
|
|
||
| struct wl_egl_window { | ||
| const intptr_t version; | ||
|
|
||
| int width; | ||
| int height; | ||
| int dx; | ||
| int dy; | ||
|
|
||
| int attached_width; | ||
| int attached_height; | ||
|
|
||
| void *driver_private; | ||
| void (*resize_callback)(struct wl_egl_window *, void *); | ||
| void (*destroy_window_callback)(void *); | ||
|
|
||
| struct wl_surface *surface; | ||
| }; | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright © 2011 Kristian Høgsberg | ||
| * Copyright © 2011 Benjamin Franzke | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice (including the next | ||
| * paragraph) shall be included in all copies or substantial portions of the | ||
| * Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * Authors: | ||
| * Kristian Høgsberg <[email protected]> | ||
| * Benjamin Franzke <[email protected]> | ||
| */ | ||
|
|
||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| #include "wayland-egl.h" | ||
| #include "wayland-egl-backend.h" | ||
| #include "wayland-util.h" | ||
|
|
||
|
|
||
| WL_EXPORT void | ||
| wl_egl_window_resize(struct wl_egl_window *egl_window, | ||
| int width, int height, | ||
| int dx, int dy) | ||
| { | ||
| if (width <= 0 || height <= 0) | ||
| return; | ||
|
|
||
| egl_window->width = width; | ||
| egl_window->height = height; | ||
| egl_window->dx = dx; | ||
| egl_window->dy = dy; | ||
|
|
||
| if (egl_window->resize_callback) | ||
| egl_window->resize_callback(egl_window, egl_window->driver_private); | ||
| } | ||
|
|
||
| WL_EXPORT struct wl_egl_window * | ||
| wl_egl_window_create(struct wl_surface *surface, | ||
| int width, int height) | ||
| { | ||
| struct wl_egl_window *egl_window; | ||
|
|
||
| if (width <= 0 || height <= 0) | ||
| return NULL; | ||
|
|
||
| egl_window = calloc(1, sizeof *egl_window); | ||
| if (!egl_window) | ||
| return NULL; | ||
|
|
||
| /* Cast away the constness to set the version number. | ||
| * | ||
| * We want the const notation since it gives an explicit | ||
| * feedback to the backend implementation, should it try to | ||
| * change it. | ||
| * | ||
| * The latter in itself is not too surprising as these days APIs | ||
| * tend to provide bidirectional version field. | ||
| */ | ||
| intptr_t *version = (intptr_t *)&egl_window->version; | ||
| *version = WL_EGL_WINDOW_VERSION; | ||
|
|
||
| egl_window->surface = surface; | ||
|
|
||
| egl_window->width = width; | ||
| egl_window->height = height; | ||
|
|
||
| return egl_window; | ||
| } | ||
|
|
||
| WL_EXPORT void | ||
| wl_egl_window_destroy(struct wl_egl_window *egl_window) | ||
| { | ||
| if (egl_window->destroy_window_callback) | ||
| egl_window->destroy_window_callback(egl_window->driver_private); | ||
| free(egl_window); | ||
| } | ||
|
|
||
| WL_EXPORT void | ||
| wl_egl_window_get_attached_size(struct wl_egl_window *egl_window, | ||
| int *width, int *height) | ||
| { | ||
| if (width) | ||
| *width = egl_window->attached_width; | ||
| if (height) | ||
| *height = egl_window->attached_height; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're not removing the window from the list, which leads to crash. Also, I'd rather use
destroy_windowinstead of freeing directly.