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

xwayland: Move Xwayland cursor declarations 

Move the Xwayland cursor 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-18 10:45:17 +01:00
parent aaeeb10b74
commit 211609a938
8 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwayland/Makefile.am
View File

@ -14,6 +14,7 @@ Xwayland_SOURCES = \
xwayland-input.c \ xwayland-input.c \
xwayland-input.h \ xwayland-input.h \
xwayland-cursor.c \ xwayland-cursor.c \
xwayland-cursor.h \
xwayland-glamor.h \ xwayland-glamor.h \
xwayland-pixmap.c \ xwayland-pixmap.c \
xwayland-pixmap.h \ xwayland-pixmap.h \

1
hw/xwayland/meson.build
View File

@ -3,6 +3,7 @@ srcs = [
'xwayland-input.c', 'xwayland-input.c',
'xwayland-input.h', 'xwayland-input.h',
'xwayland-cursor.c', 'xwayland-cursor.c',
'xwayland-cursor.h',
'xwayland-glamor.h', 'xwayland-glamor.h',
'xwayland-pixmap.c', 'xwayland-pixmap.c',
'xwayland-pixmap.h', 'xwayland-pixmap.h',

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

@ -33,6 +33,7 @@
#include "mipointer.h" #include "mipointer.h"
#include "xwayland.h" #include "xwayland.h"
#include "xwayland-cursor.h"
#include "xwayland-input.h" #include "xwayland-input.h"
#include "xwayland-shm.h" #include "xwayland-shm.h"
#include "xwayland-types.h" #include "xwayland-types.h"

38
hw/xwayland/xwayland-cursor.h Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright © 2014 Intel Corporation
* Copyright © 2011 Kristian Høgsberg
*
* 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_CURSOR_H
#define XWAYLAND_CURSOR_H
#include <xwayland-config.h>
#include <xwayland-types.h>
#include <xwayland-input.h>
void xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *tool);
void xwl_seat_set_cursor(struct xwl_seat *xwl_seat);
Bool xwl_screen_init_cursor(struct xwl_screen *xwl_screen);
#endif /* XWAYLAND_CURSOR_H */

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

@ -40,6 +40,7 @@
#include <misc.h> #include <misc.h>
#include "xwayland.h" #include "xwayland.h"
#include "xwayland-cursor.h"
#include "xwayland-input.h" #include "xwayland-input.h"
#include "xwayland-window.h" #include "xwayland-window.h"

3
hw/xwayland/xwayland-input.h
View File

@ -173,9 +173,6 @@ struct xwl_tablet_pad {
struct xorg_list pad_group_list; struct xorg_list pad_group_list;
}; };
void xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *tool);
void xwl_seat_set_cursor(struct xwl_seat *xwl_seat);
void xwl_seat_destroy(struct xwl_seat *xwl_seat); void xwl_seat_destroy(struct xwl_seat *xwl_seat);
void xwl_seat_clear_touch(struct xwl_seat *xwl_seat, WindowPtr window); void xwl_seat_clear_touch(struct xwl_seat *xwl_seat, WindowPtr window);

1
hw/xwayland/xwayland.c
View File

@ -37,6 +37,7 @@
#include <propertyst.h> #include <propertyst.h>
#include "xwayland.h" #include "xwayland.h"
#include "xwayland-cursor.h"
#include "xwayland-glamor.h" #include "xwayland-glamor.h"
#include "xwayland-input.h" #include "xwayland-input.h"
#include "xwayland-output.h" #include "xwayland-output.h"

2
hw/xwayland/xwayland.h
View File

@ -139,8 +139,6 @@ void xwl_surface_damage(struct xwl_screen *xwl_screen,
struct wl_surface *surface, struct wl_surface *surface,
int32_t x, int32_t y, int32_t width, int32_t height); int32_t x, int32_t y, int32_t width, int32_t height);
Bool xwl_screen_init_cursor(struct xwl_screen *xwl_screen);
struct xwl_screen *xwl_screen_get(ScreenPtr screen); struct xwl_screen *xwl_screen_get(ScreenPtr screen);
Bool xwl_screen_has_resolution_change_emulation(struct xwl_screen *xwl_screen); Bool xwl_screen_has_resolution_change_emulation(struct xwl_screen *xwl_screen);
struct xwl_output *xwl_screen_get_first_output(struct xwl_screen *xwl_screen); struct xwl_output *xwl_screen_get_first_output(struct xwl_screen *xwl_screen);