fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 16:20:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport GetSpritePosition()"

Browse source 
This reverts commit eb81769b58.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
This commit is contained in:
Alan Coopersmith 2025-08-31 12:24:29 -07:00 • committed by Marge Bot
parent 372ca9114c
commit 066b377fc9
6 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xi/exevents.c
View file

@ -80,8 +80,6 @@ SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#include "dix/cursor_priv.h"
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/geproto.h> #include <X11/extensions/geproto.h>

1
Xi/xibarriers.c
View file

@ -43,7 +43,6 @@
#include <dix-config.h> #include <dix-config.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "mi/mi_priv.h" #include "mi/mi_priv.h"

2
dix/cursor_priv.h
View file

@ -71,6 +71,4 @@ void NewCurrentScreen(DeviceIntPtr pDev,
Bool PointerConfinedToScreen(DeviceIntPtr pDev); Bool PointerConfinedToScreen(DeviceIntPtr pDev);
void GetSpritePosition(DeviceIntPtr pDev, int *px, int *py);
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */ #endif /* _XSERVER_DIX_CURSOR_PRIV_H */

4
include/cursor.h
View file

@ -70,6 +70,10 @@ typedef struct _CursorMetric *CursorMetricPtr;
extern _X_EXPORT int FreeCursor(void *pCurs, extern _X_EXPORT int FreeCursor(void *pCurs,
XID cid); XID cid);
extern _X_EXPORT void GetSpritePosition(struct _DeviceIntRec * /* pDev */ ,
int * /*px */ ,
int * /*py */ );
#ifdef PANORAMIX #ifdef PANORAMIX
extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev); extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev);
#endif /* PANORAMIX */ #endif /* PANORAMIX */

3
randr/rrpointer.c
View file

@ -19,9 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
*/ */
#include <dix-config.h>
#include "dix/cursor_priv.h"
#include "randrstr.h" #include "randrstr.h"
#include "inputstr.h" #include "inputstr.h"

1
xkb/xkbActions.c
View file

@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/dixgrabs_priv.h" #include "dix/dixgrabs_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"