frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Move Xwayland present declarations 

Move the Xwayland Present declarations to their own header file.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Olivier Fourdan 2019-12-17 17:18:11 +01:00
parent d780bdc2fd
commit e23d2223d8
7 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwayland/Makefile.am
View File

@ -16,6 +16,7 @@ Xwayland_SOURCES = \
xwayland-glamor.h \
xwayland-pixmap.c \
xwayland-pixmap.h \
xwayland-present.h \
xwayland-shm.c \
xwayland-shm.h \
xwayland-types.h \

1
hw/xwayland/meson.build
View File

@ -5,6 +5,7 @@ srcs = [
'xwayland-glamor.h',
'xwayland-pixmap.c',
'xwayland-pixmap.h',
'xwayland-present.h',
'xwayland-shm.c',
'xwayland-shm.h',
'xwayland-types.h',

1
hw/xwayland/xwayland-present.c
View File

@ -31,6 +31,7 @@
#include <present.h>
#include "xwayland.h"
#include "xwayland-present.h"
#include "xwayland-window.h"
#include "xwayland-pixmap.h"
#include "glamor.h"

74
hw/xwayland/xwayland-present.h Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright © 2018 Roman Gilg
*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of the
* copyright holders not be used in advertising or publicity
* pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
#ifndef XWAYLAND_PRESENT_H
#define XWAYLAND_PRESENT_H
#include <xwayland-config.h>
#include <dix.h>
#include "xwayland-types.h"
#ifdef GLAMOR_HAS_GBM
struct xwl_present_window {
struct xwl_screen *xwl_screen;
struct xwl_present_event *sync_flip;
WindowPtr window;
struct xorg_list frame_callback_list;
uint64_t msc;
uint64_t ust;
OsTimerPtr frame_timer;
struct wl_callback *sync_callback;
struct xorg_list event_list;
struct xorg_list release_queue;
};
struct xwl_present_event {
uint64_t event_id;
uint64_t target_msc;
Bool abort;
Bool pending;
Bool buffer_released;
struct xwl_present_window *xwl_present_window;
struct wl_buffer *buffer;
struct xorg_list list;
};
void xwl_present_frame_callback(struct xwl_present_window *xwl_present_window);
Bool xwl_present_init(ScreenPtr screen);
void xwl_present_cleanup(WindowPtr window);
void xwl_present_unrealize_window(WindowPtr window);
#endif /* GLAMOR_HAS_GBM */
#endif /* XWAYLAND_PRESENT_H */

1
hw/xwayland/xwayland-window.c
View File

@ -36,6 +36,7 @@
#include "propertyst.h"
#include "xwayland-types.h"
#include "xwayland-present.h"
#include "xwayland-window.h"
#include "xwayland-window-buffers.h"
#include "xwayland-shm.h"

1
hw/xwayland/xwayland.c
View File

@ -39,6 +39,7 @@
#include "xwayland.h"
#include "xwayland-glamor.h"
#include "xwayland-pixmap.h"
#include "xwayland-present.h"
#include "xwayland-shm.h"
#include "xwayland-window-buffers.h"
#include "xwayland-window.h"

44
hw/xwayland/xwayland.h
View File

@ -121,39 +121,6 @@ struct xwl_screen {
Atom allow_commits_prop;
};
#ifdef GLAMOR_HAS_GBM
struct xwl_present_window {
struct xwl_screen *xwl_screen;
struct xwl_present_event *sync_flip;
WindowPtr window;
struct xorg_list frame_callback_list;
uint64_t msc;
uint64_t ust;
OsTimerPtr frame_timer;
struct wl_callback *sync_callback;
struct xorg_list event_list;
struct xorg_list release_queue;
};
struct xwl_present_event {
uint64_t event_id;
uint64_t target_msc;
Bool abort;
Bool pending;
Bool buffer_released;
struct xwl_present_window *xwl_present_window;
struct wl_buffer *buffer;
struct xorg_list list;
};
#endif
#define MODIFIER_META 0x01
struct xwl_touch {
@ -384,17 +351,6 @@ void xwl_output_set_window_randr_emu_props(struct xwl_screen *xwl_screen,
RRModePtr xwayland_cvt(int HDisplay, int VDisplay,
float VRefresh, Bool Reduced, Bool Interlaced);
#ifdef XWL_HAS_GLAMOR
#ifdef GLAMOR_HAS_GBM
void xwl_present_frame_callback(struct xwl_present_window *xwl_present_window);
Bool xwl_present_init(ScreenPtr screen);
void xwl_present_cleanup(WindowPtr window);
void xwl_present_unrealize_window(WindowPtr window);
#endif /* GLAMOR_HAS_GBM */
#endif /* XWL_HAS_GLAMOR */
void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
void xwl_screen_init_xdg_output(struct xwl_screen *xwl_screen);