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

Revert "dix: unexport NewCurrentScreen()"

Browse source 
This reverts commit bd3c252710.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
This commit is contained in:
Alan Coopersmith 2025-08-31 12:27:51 -07:00 • committed by Marge Bot
parent b75173a283
commit 774da7dfc0
6 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Xi/xiwarppointer.c
View file

@ -36,7 +36,6 @@
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XI2proto.h> #include <X11/extensions/XI2proto.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"

7
dix/cursor_priv.h
View file

@ -10,10 +10,8 @@
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "dix/screenint_priv.h"
#include "include/cursor.h" #include "include/cursor.h"
#include "include/dix.h" #include "include/dix.h"
#include "include/input.h"
#include "include/window.h" #include "include/window.h"
extern CursorPtr rootCursor; extern CursorPtr rootCursor;
@ -64,9 +62,4 @@ Bool CursorMetricsFromGlyph(FontPtr pfont,
void CheckCursorConfinement(WindowPtr pWin); void CheckCursorConfinement(WindowPtr pWin);
void NewCurrentScreen(DeviceIntPtr pDev,
ScreenPtr newScreen,
int x,
int y);
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */ #endif /* _XSERVER_DIX_CURSOR_PRIV_H */

1
hw/xnest/Events.c
View file

@ -17,7 +17,6 @@ is" without express or implied warranty.
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "dix/cursor_priv.h"
#include "mi/mi_priv.h" #include "mi/mi_priv.h"
#include "screenint.h" #include "screenint.h"

5
include/cursor.h
View file

@ -70,6 +70,11 @@ 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 NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
ScreenPtr /*newScreen */ ,
int /*x */ ,
int /*y */ );
extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */ extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */
); );

1
mi/mieq.c
View file

@ -41,7 +41,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include <X11/extensions/geproto.h> #include <X11/extensions/geproto.h>
#include "dix/cursor_priv.h"
#include "mi/mi_priv.h" #include "mi/mi_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"
#include "os/screensaver.h" #include "os/screensaver.h"

1
mi/mipointer.c
View file

@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xproto.h> #include <X11/Xproto.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"