Remove horrendously ugly DDX backward-compatibility.
This commit is contained in:
parent
d81edb9e00
commit
32be08ba72
|
@ -17,6 +17,13 @@
|
|||
* os/WaitFor.c:
|
||||
Die, XTESTEXT1, die!
|
||||
|
||||
* dix/devices.c:
|
||||
* include/input.h:
|
||||
* mi/mipointer.h:
|
||||
* mi/mipointer.c:
|
||||
Get rid of horrendous, somewhat misguided, DDX binary-compatibility
|
||||
glue.
|
||||
|
||||
2006-05-30 Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
|
||||
* hw/xfree86/os-support/bsd/Makefile.am:
|
||||
|
|
|
@ -48,7 +48,7 @@ SOFTWARE.
|
|||
|
||||
|
||||
/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.9 2006/02/15 20:44:12 ajax Exp $ */
|
||||
/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.10 2006/03/28 01:20:59 ajax Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
@ -83,7 +83,7 @@ SOFTWARE.
|
|||
#include "dixevents.h"
|
||||
|
||||
DeviceIntPtr
|
||||
_AddInputDevice(DeviceProc deviceProc, Bool autoStart)
|
||||
AddInputDevice(DeviceProc deviceProc, Bool autoStart)
|
||||
{
|
||||
register DeviceIntPtr dev;
|
||||
|
||||
|
@ -356,7 +356,7 @@ NumMotionEvents()
|
|||
}
|
||||
|
||||
void
|
||||
_RegisterPointerDevice(DeviceIntPtr device)
|
||||
RegisterPointerDevice(DeviceIntPtr device)
|
||||
{
|
||||
inputInfo.pointer = device;
|
||||
#ifdef XKB
|
||||
|
@ -379,7 +379,7 @@ _RegisterPointerDevice(DeviceIntPtr device)
|
|||
}
|
||||
|
||||
void
|
||||
_RegisterKeyboardDevice(DeviceIntPtr device)
|
||||
RegisterKeyboardDevice(DeviceIntPtr device)
|
||||
{
|
||||
inputInfo.keyboard = device;
|
||||
#ifdef XKB
|
||||
|
@ -1629,38 +1629,3 @@ ProcQueryKeymap(ClientPtr client)
|
|||
WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
|
||||
return Success;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* The following entrypoints are provided for binary compatibility with
|
||||
* previous versions (they make casts, where the current version changes types
|
||||
* for more stringent prototype checking).
|
||||
******************************************************************************/
|
||||
#ifdef AddInputDevice
|
||||
#undef AddInputDevice
|
||||
|
||||
DevicePtr
|
||||
AddInputDevice(DeviceProc deviceProc, Bool autoStart)
|
||||
{
|
||||
return (DevicePtr)_AddInputDevice(deviceProc, autoStart);
|
||||
}
|
||||
#endif /* AddInputDevice */
|
||||
|
||||
#ifdef RegisterPointerDevice
|
||||
#undef RegisterPointerDevice
|
||||
|
||||
void
|
||||
RegisterPointerDevice(DevicePtr device)
|
||||
{
|
||||
_RegisterPointerDevice((DeviceIntPtr)device);
|
||||
}
|
||||
#endif /* RegisterPointerDevice */
|
||||
|
||||
#ifdef RegisterKeyboardDevice
|
||||
#undef RegisterKeyboardDevice
|
||||
|
||||
void
|
||||
RegisterKeyboardDevice(DevicePtr device)
|
||||
{
|
||||
_RegisterKeyboardDevice((DeviceIntPtr)device);
|
||||
}
|
||||
#endif /* RegisterKeyboardDevice */
|
||||
|
|
|
@ -669,13 +669,13 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
|
|||
dmxLocal->isCore = 1;
|
||||
dmxLocalCoreKeyboard = dmxLocal;
|
||||
name = "keyboard";
|
||||
registerProcPtr = _RegisterKeyboardDevice;
|
||||
registerProcPtr = RegisterKeyboardDevice;
|
||||
}
|
||||
if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) {
|
||||
dmxLocal->isCore = 1;
|
||||
dmxLocalCorePointer = dmxLocal;
|
||||
name = "pointer";
|
||||
registerProcPtr = _RegisterPointerDevice;
|
||||
registerProcPtr = RegisterPointerDevice;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ int ChangeKeyboardDevice(DeviceIntPtr old_dev, DeviceIntPtr new_dev)
|
|||
dmxLocalNew->sendsCore = 1;
|
||||
dmxLocalCorePointer = dmxLocalNew;
|
||||
|
||||
_RegisterKeyboardDevice(new_dev);
|
||||
RegisterKeyboardDevice(new_dev);
|
||||
RegisterOtherDevice(old_dev);
|
||||
|
||||
return Success;
|
||||
|
|
|
@ -163,15 +163,7 @@ extern void ResetDevicePrivateIndex(void);
|
|||
extern KeybdCtrl defaultKeyboardControl;
|
||||
extern PtrCtrl defaultPointerControl;
|
||||
|
||||
#undef AddInputDevice
|
||||
extern DevicePtr AddInputDevice(
|
||||
DeviceProc /*deviceProc*/,
|
||||
Bool /*autoStart*/);
|
||||
|
||||
#define AddInputDevice(deviceProc, autoStart) \
|
||||
_AddInputDevice(deviceProc, autoStart)
|
||||
|
||||
extern DeviceIntPtr _AddInputDevice(
|
||||
extern DeviceIntPtr AddInputDevice(
|
||||
DeviceProc /*deviceProc*/,
|
||||
Bool /*autoStart*/);
|
||||
|
||||
|
@ -190,24 +182,10 @@ extern void RemoveDevice(
|
|||
|
||||
extern int NumMotionEvents(void);
|
||||
|
||||
#undef RegisterPointerDevice
|
||||
extern void RegisterPointerDevice(
|
||||
DevicePtr /*device*/);
|
||||
|
||||
#define RegisterPointerDevice(device) \
|
||||
_RegisterPointerDevice(device)
|
||||
|
||||
extern void _RegisterPointerDevice(
|
||||
DeviceIntPtr /*device*/);
|
||||
|
||||
#undef RegisterKeyboardDevice
|
||||
extern void RegisterKeyboardDevice(
|
||||
DevicePtr /*device*/);
|
||||
|
||||
#define RegisterKeyboardDevice(device) \
|
||||
_RegisterKeyboardDevice(device)
|
||||
|
||||
extern void _RegisterKeyboardDevice(
|
||||
DeviceIntPtr /*device*/);
|
||||
|
||||
extern DevicePtr LookupKeyboardDevice(void);
|
||||
|
|
|
@ -523,22 +523,9 @@ miPointerMove (pScreen, x, y, time)
|
|||
}
|
||||
|
||||
void
|
||||
_miRegisterPointerDevice (pScreen, pDevice)
|
||||
miRegisterPointerDevice (pScreen, pDevice)
|
||||
ScreenPtr pScreen;
|
||||
DeviceIntPtr pDevice;
|
||||
{
|
||||
miPointer.pPointer = (DevicePtr)pDevice;
|
||||
}
|
||||
|
||||
/* obsolete: for binary compatibility */
|
||||
|
||||
#ifdef miRegisterPointerDevice
|
||||
#undef miRegisterPointerDevice
|
||||
void
|
||||
miRegisterPointerDevice (pScreen, pDevice)
|
||||
ScreenPtr pScreen;
|
||||
DevicePtr pDevice;
|
||||
{
|
||||
miPointer.pPointer = pDevice;
|
||||
}
|
||||
#endif /* miRegisterPointerDevice */
|
||||
|
|
|
@ -134,12 +134,6 @@ extern void miPointerPosition(
|
|||
int * /*y*/
|
||||
);
|
||||
|
||||
#undef miRegisterPointerDevice
|
||||
extern void miRegisterPointerDevice(
|
||||
ScreenPtr /*pScreen*/,
|
||||
DevicePtr /*pDevice*/
|
||||
);
|
||||
|
||||
extern void miPointerSetNewScreen(
|
||||
int, /*screen_no*/
|
||||
int, /*x*/
|
||||
|
@ -149,10 +143,7 @@ extern ScreenPtr miPointerCurrentScreen(
|
|||
void
|
||||
);
|
||||
|
||||
#define miRegisterPointerDevice(pScreen,pDevice) \
|
||||
_miRegisterPointerDevice(pScreen,pDevice)
|
||||
|
||||
extern void _miRegisterPointerDevice(
|
||||
extern void miRegisterPointerDevice(
|
||||
ScreenPtr /*pScreen*/,
|
||||
DeviceIntPtr /*pDevice*/
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue
Block a user