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

Revert "dix: unexport cursor allocation functions"

Browse source 
This reverts commit 24f3c4a508.

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

34
dix/cursor_priv.h
View file

@ -5,11 +5,7 @@
#ifndef _XSERVER_DIX_CURSOR_PRIV_H #ifndef _XSERVER_DIX_CURSOR_PRIV_H
#define _XSERVER_DIX_CURSOR_PRIV_H #define _XSERVER_DIX_CURSOR_PRIV_H
#include <X11/X.h>
#include <X11/Xmd.h>
#include "include/cursor.h" #include "include/cursor.h"
#include "include/dix.h"
extern CursorPtr rootCursor; extern CursorPtr rootCursor;
@ -18,34 +14,4 @@ CursorPtr RefCursor(CursorPtr cursor);
CursorPtr UnrefCursor(CursorPtr cursor); CursorPtr UnrefCursor(CursorPtr cursor);
int CursorRefCount(ConstCursorPtr cursor); int CursorRefCount(ConstCursorPtr cursor);
int AllocARGBCursor(unsigned char *psrcbits,
unsigned char *pmaskbits,
CARD32 *argb,
CursorMetricPtr cm,
unsigned foreRed,
unsigned foreGreen,
unsigned foreBlue,
unsigned backRed,
unsigned backGreen,
unsigned backBlue,
CursorPtr *ppCurs,
ClientPtr client,
XID cid);
int AllocGlyphCursor(Font source,
unsigned int sourceChar,
Font mask,
unsigned int maskChar,
unsigned foreRed,
unsigned foreGreen,
unsigned foreBlue,
unsigned backRed,
unsigned backGreen,
unsigned backBlue,
CursorPtr *ppCurs,
ClientPtr client,
XID cid);
CursorPtr CreateRootCursor(void);
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */ #endif /* _XSERVER_DIX_CURSOR_PRIV_H */

1
dix/dispatch.c
View file

@ -104,7 +104,6 @@ Equipment Corporation.
#include <X11/fonts/libxfont2.h> #include <X11/fonts/libxfont2.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 "dix/input_priv.h" #include "dix/input_priv.h"
#include "dix/gc_priv.h" #include "dix/gc_priv.h"

30
include/cursor.h
View file

@ -70,6 +70,36 @@ 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 int AllocARGBCursor(unsigned char * /*psrcbits */ ,
unsigned char * /*pmaskbits */ ,
CARD32 * /*argb */ ,
CursorMetricPtr /*cm */ ,
unsigned /*foreRed */ ,
unsigned /*foreGreen */ ,
unsigned /*foreBlue */ ,
unsigned /*backRed */ ,
unsigned /*backGreen */ ,
unsigned /*backBlue */ ,
CursorPtr * /*ppCurs */ ,
ClientPtr /*client */ ,
XID /*cid */ );
extern _X_EXPORT int AllocGlyphCursor(Font /*source */ ,
unsigned int /*sourceChar */ ,
Font /*mask */ ,
unsigned int /*maskChar */ ,
unsigned /*foreRed */ ,
unsigned /*foreGreen */ ,
unsigned /*foreBlue */ ,
unsigned /*backRed */ ,
unsigned /*backGreen */ ,
unsigned /*backBlue */ ,
CursorPtr * /*ppCurs */ ,
ClientPtr /*client */ ,
XID /*cid */ );
extern _X_EXPORT CursorPtr CreateRootCursor(void);
extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ , extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ ,
unsigned int /*ch */ , unsigned int /*ch */ ,
CursorMetricPtr /*cm */ , CursorMetricPtr /*cm */ ,

4
render/render.c
View file

@ -24,14 +24,12 @@
#include <dix-config.h> #include <dix-config.h>
#include <stdint.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/render.h> #include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h> #include <X11/extensions/renderproto.h>
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/osdep.h" #include "os/osdep.h"
@ -57,6 +55,8 @@
#include "panoramiXsrv.h" #include "panoramiXsrv.h"
#endif /* XINERAMA */ #endif /* XINERAMA */
#include <stdint.h>
static int ProcRenderQueryVersion(ClientPtr pClient); static int ProcRenderQueryVersion(ClientPtr pClient);
static int ProcRenderQueryPictFormats(ClientPtr pClient); static int ProcRenderQueryPictFormats(ClientPtr pClient);
static int ProcRenderQueryPictIndexValues(ClientPtr pClient); static int ProcRenderQueryPictIndexValues(ClientPtr pClient);