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

Revert "dix: unexport cursor refcounting functions"

Browse source 
This reverts commit 4aadbeb8aa.

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

1
Xext/saver.c
View file

@ -34,7 +34,6 @@ in this Software without prior written authorization from the X Consortium.
#include <X11/extensions/saverproto.h> #include <X11/extensions/saverproto.h>
#include "dix/colormap_priv.h" #include "dix/colormap_priv.h"
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/osdep.h" #include "os/osdep.h"
#include "os/screensaver.h" #include "os/screensaver.h"

1
dix/cursor.c
View file

@ -49,7 +49,6 @@ SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "servermd.h" #include "servermd.h"

5
dix/cursor_priv.h
View file

@ -9,9 +9,4 @@
extern CursorPtr rootCursor; extern CursorPtr rootCursor;
/* reference counting */
CursorPtr RefCursor(CursorPtr cursor);
CursorPtr UnrefCursor(CursorPtr cursor);
int CursorRefCount(ConstCursorPtr cursor);
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */ #endif /* _XSERVER_DIX_CURSOR_PRIV_H */

1
dix/events.c
View file

@ -118,7 +118,6 @@ Equipment Corporation.
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.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 "dix/dixgrabs_priv.h" #include "dix/dixgrabs_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"

1
dix/grabs.c
View file

@ -51,7 +51,6 @@ SOFTWARE.
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/XI2.h> #include <X11/extensions/XI2.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/exevents_priv.h" #include "dix/exevents_priv.h"

1
hw/xfree86/ramdac/xf86CursorRD.c
View file

@ -3,7 +3,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#include "dix/cursor_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"
#include "xf86.h" #include "xf86.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 CursorPtr RefCursor(CursorPtr /* cursor */);
extern _X_EXPORT CursorPtr UnrefCursor(CursorPtr /* cursor */);
extern _X_EXPORT int CursorRefCount(ConstCursorPtr /* cursor */);
extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ , extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ ,
unsigned char * /*pmaskbits */ , unsigned char * /*pmaskbits */ ,
CARD32 * /*argb */ , CARD32 * /*argb */ ,

3
render/animcur.c
View file

@ -35,9 +35,6 @@
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "dix/cursor_priv.h"
#include "servermd.h" #include "servermd.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "dixstruct.h" #include "dixstruct.h"

1
xfixes/cursor.c
View file

@ -44,7 +44,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"