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

Revert "xfree86: common: move private defs from xf86Xinput.h to xf86Xinput_priv.h" 

This reverts commit df33e1c51b.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
This commit is contained in:
Alan Coopersmith 2025-06-17 14:36:09 -07:00 committed by Marge Bot
parent c692580d74
commit 711fdc51f1
8 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,6 @@
#include "xf86pciBus.h" #include "xf86pciBus.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Xinput_priv.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "picture.h" #include "picture.h"

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

@ -77,7 +77,7 @@
#endif #endif
#include "inputstr.h" #include "inputstr.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput.h"
#include "mipointer.h" #include "mipointer.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "xkbstr.h" #include "xkbstr.h"

2
hw/xfree86/common/xf86Helper.c
View File

@ -57,7 +57,7 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "micmap.h" #include "micmap.h"
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput.h"
#include "xf86InPriv.h" #include "xf86InPriv.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "mivalidate.h" #include "mivalidate.h"

2
hw/xfree86/common/xf86PM.c
View File

@ -32,7 +32,7 @@
#include <X11/X.h> #include <X11/X.h>
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL; int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;

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

@ -64,7 +64,7 @@
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput.h"
#include "XIstubs.h" #include "XIstubs.h"
#include "xf86Optrec.h" #include "xf86Optrec.h"
#include "mipointer.h" #include "mipointer.h"

7
hw/xfree86/common/xf86Xinput.h
View File

@ -114,6 +114,9 @@ struct _InputInfoRec {
InputAttributes *attrs; InputAttributes *attrs;
}; };
/* xf86Globals.c */
extern InputInfoPtr xf86InputDevs;
/* xf86Xinput.c */ /* xf86Xinput.c */
extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
int first_valuator, int num_valuators, int first_valuator, int num_valuators,
@ -187,6 +190,10 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev); extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
extern _X_EXPORT void xf86InputEnableVTProbe(void); extern _X_EXPORT void xf86InputEnableVTProbe(void);
/* not exported */
int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
InputInfoPtr xf86AllocateInput(void);
/* xf86Helper.c */ /* xf86Helper.c */
extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module, extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
int flags); int flags);

15
hw/xfree86/common/xf86Xinput_priv.h
View File

@ -1,15 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER__XF86XINPUT_H
#define _XSERVER__XF86XINPUT_H
#include "xf86Xinput.h"
extern InputInfoPtr xf86InputDevs;
int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
InputInfoPtr xf86AllocateInput(void);
#endif /* _XSERVER__XF86XINPUT_H */

2
hw/xfree86/os-support/linux/systemd-logind.c
View File

@ -39,7 +39,7 @@
#include "linux.h" #include "linux.h"
#include "xf86.h" #include "xf86.h"
#include "xf86platformBus.h" #include "xf86platformBus.h"
#include "xf86Xinput_priv.h" #include "xf86Xinput.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "globals.h" #include "globals.h"