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

xfree86: common: move non-exported funcs from dgaproc.h to separate header 

The typdef and defines from dgaproc.h are used by drivers, so it needs to
remain part of the public API. But no need to clutter the public header
with non-exported function declarations.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1323>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-06 16:22:04 +01:00 committed by Marge Bot
parent 22a67f7818
commit ee011ea82b
8 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/common/dgaproc.h
View File

@ -52,16 +52,4 @@ typedef struct {
int reserved2; int reserved2;
} XDGAModeRec, *XDGAModePtr; } XDGAModeRec, *XDGAModePtr;
/* DDX interface */
extern Bool DGAScreenAvailable(ScreenPtr pScreen);
extern Bool DGAActive(int Index);
extern Bool DGAVTSwitch(void);
extern Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index,
int button, int is_down);
extern Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
extern Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index,
int key_code, int is_down);
#endif /* __DGAPROC_H */ #endif /* __DGAPROC_H */

19
hw/xfree86/common/dgaproc_priv.h Normal file
View File

@ -0,0 +1,19 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef __XSERVER_XFREE86_DGAPROC_H
#define __XSERVER_XFREE86_DGAPROC_H
#include "screenint.h"
#include "input.h"
Bool DGAScreenAvailable(ScreenPtr pScreen);
Bool DGAActive(int Index);
Bool DGAVTSwitch(void);
Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button, int is_down);
Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
#endif /* __XSERVER_XFREE86_DGAPROC_H */

1
hw/xfree86/common/xf86Cursor.c
View File

@ -46,6 +46,7 @@
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#endif #endif
typedef struct _xf86EdgeRec { typedef struct _xf86EdgeRec {

1
hw/xfree86/common/xf86DGA.c
View File

@ -47,6 +47,7 @@
#include "xf86str.h" #include "xf86str.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#include <X11/extensions/xf86dgaproto.h> #include <X11/extensions/xf86dgaproto.h>
#include "colormapst.h" #include "colormapst.h"
#include "pixmapstr.h" #include "pixmapstr.h"

1
hw/xfree86/common/xf86Events.c
View File

@ -65,6 +65,7 @@
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#endif #endif
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>

1
hw/xfree86/common/xf86Xinput.c
View File

@ -98,6 +98,7 @@
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#endif #endif
#include "xkbsrv.h" #include "xkbsrv.h"

1
hw/xfree86/common/xf86cmap.c
View File

@ -55,6 +55,7 @@
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include <X11/extensions/xf86dgaproto.h> #include <X11/extensions/xf86dgaproto.h>
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#endif #endif
#include "xf86cmap.h" #include "xf86cmap.h"

1
hw/xfree86/modes/xf86DiDGA.c
View File

@ -28,6 +28,7 @@
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "dgaproc.h" #include "dgaproc.h"
#include "dgaproc_priv.h"
#include "xf86Crtc.h" #include "xf86Crtc.h"
#include "xf86Modes.h" #include "xf86Modes.h"
#include "gcstruct.h" #include "gcstruct.h"