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

Remove horrendously ugly DDX backward-compatibility.

This commit is contained in:
Daniel Stone 2006-06-01 19:22:38 +00:00
parent d81edb9e00
commit 32be08ba72
7 changed files with 17 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -17,6 +17,13 @@
* os/WaitFor.c: * os/WaitFor.c:
Die, XTESTEXT1, die! 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> 2006-05-30 Matthieu Herrb <matthieu.herrb@laas.fr>
* hw/xfree86/os-support/bsd/Makefile.am: * hw/xfree86/os-support/bsd/Makefile.am:

43
dix/devices.c
View File

@ -48,7 +48,7 @@ SOFTWARE.
/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /* $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 #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
@ -83,7 +83,7 @@ SOFTWARE.
#include "dixevents.h" #include "dixevents.h"
DeviceIntPtr DeviceIntPtr
_AddInputDevice(DeviceProc deviceProc, Bool autoStart) AddInputDevice(DeviceProc deviceProc, Bool autoStart)
{ {
register DeviceIntPtr dev; register DeviceIntPtr dev;
@ -356,7 +356,7 @@ NumMotionEvents()
} }
void void
_RegisterPointerDevice(DeviceIntPtr device) RegisterPointerDevice(DeviceIntPtr device)
{ {
inputInfo.pointer = device; inputInfo.pointer = device;
#ifdef XKB #ifdef XKB
@ -379,7 +379,7 @@ _RegisterPointerDevice(DeviceIntPtr device)
} }
void void
_RegisterKeyboardDevice(DeviceIntPtr device) RegisterKeyboardDevice(DeviceIntPtr device)
{ {
inputInfo.keyboard = device; inputInfo.keyboard = device;
#ifdef XKB #ifdef XKB
@ -1629,38 +1629,3 @@ ProcQueryKeymap(ClientPtr client)
WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep); WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
return Success; 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 */

4
hw/dmx/input/dmxinputinit.c
View File

@ -669,13 +669,13 @@ static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
dmxLocal->isCore = 1; dmxLocal->isCore = 1;
dmxLocalCoreKeyboard = dmxLocal; dmxLocalCoreKeyboard = dmxLocal;
name = "keyboard"; name = "keyboard";
registerProcPtr = _RegisterKeyboardDevice; registerProcPtr = RegisterKeyboardDevice;
} }
if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) { if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) {
dmxLocal->isCore = 1; dmxLocal->isCore = 1;
dmxLocalCorePointer = dmxLocal; dmxLocalCorePointer = dmxLocal;
name = "pointer"; name = "pointer";
registerProcPtr = _RegisterPointerDevice; registerProcPtr = RegisterPointerDevice;
} }
} }

2
hw/dmx/input/dmxxinput.c
View File

@ -70,7 +70,7 @@ int ChangeKeyboardDevice(DeviceIntPtr old_dev, DeviceIntPtr new_dev)
dmxLocalNew->sendsCore = 1; dmxLocalNew->sendsCore = 1;
dmxLocalCorePointer = dmxLocalNew; dmxLocalCorePointer = dmxLocalNew;
_RegisterKeyboardDevice(new_dev); RegisterKeyboardDevice(new_dev);
RegisterOtherDevice(old_dev); RegisterOtherDevice(old_dev);
return Success; return Success;

24
include/input.h
View File

@ -163,15 +163,7 @@ extern void ResetDevicePrivateIndex(void);
extern KeybdCtrl defaultKeyboardControl; extern KeybdCtrl defaultKeyboardControl;
extern PtrCtrl defaultPointerControl; extern PtrCtrl defaultPointerControl;
#undef AddInputDevice extern DeviceIntPtr AddInputDevice(
extern DevicePtr AddInputDevice(
DeviceProc /*deviceProc*/,
Bool /*autoStart*/);
#define AddInputDevice(deviceProc, autoStart) \
_AddInputDevice(deviceProc, autoStart)
extern DeviceIntPtr _AddInputDevice(
DeviceProc /*deviceProc*/, DeviceProc /*deviceProc*/,
Bool /*autoStart*/); Bool /*autoStart*/);
@ -190,24 +182,10 @@ extern void RemoveDevice(
extern int NumMotionEvents(void); extern int NumMotionEvents(void);
#undef RegisterPointerDevice
extern void RegisterPointerDevice( extern void RegisterPointerDevice(
DevicePtr /*device*/);
#define RegisterPointerDevice(device) \
_RegisterPointerDevice(device)
extern void _RegisterPointerDevice(
DeviceIntPtr /*device*/); DeviceIntPtr /*device*/);
#undef RegisterKeyboardDevice
extern void RegisterKeyboardDevice( extern void RegisterKeyboardDevice(
DevicePtr /*device*/);
#define RegisterKeyboardDevice(device) \
_RegisterKeyboardDevice(device)
extern void _RegisterKeyboardDevice(
DeviceIntPtr /*device*/); DeviceIntPtr /*device*/);
extern DevicePtr LookupKeyboardDevice(void); extern DevicePtr LookupKeyboardDevice(void);

15
mi/mipointer.c
View File

@ -523,22 +523,9 @@ miPointerMove (pScreen, x, y, time)
} }
void void
_miRegisterPointerDevice (pScreen, pDevice) miRegisterPointerDevice (pScreen, pDevice)
ScreenPtr pScreen; ScreenPtr pScreen;
DeviceIntPtr pDevice; DeviceIntPtr pDevice;
{ {
miPointer.pPointer = (DevicePtr)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 */

11
mi/mipointer.h
View File

@ -134,12 +134,6 @@ extern void miPointerPosition(
int * /*y*/ int * /*y*/
); );
#undef miRegisterPointerDevice
extern void miRegisterPointerDevice(
ScreenPtr /*pScreen*/,
DevicePtr /*pDevice*/
);
extern void miPointerSetNewScreen( extern void miPointerSetNewScreen(
int, /*screen_no*/ int, /*screen_no*/
int, /*x*/ int, /*x*/
@ -149,10 +143,7 @@ extern ScreenPtr miPointerCurrentScreen(
void void
); );
#define miRegisterPointerDevice(pScreen,pDevice) \ extern void miRegisterPointerDevice(
_miRegisterPointerDevice(pScreen,pDevice)
extern void _miRegisterPointerDevice(
ScreenPtr /*pScreen*/, ScreenPtr /*pScreen*/,
DeviceIntPtr /*pDevice*/ DeviceIntPtr /*pDevice*/
); );