XKB: Remove unused DDX functions
They were complete no-ops anyway. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
4fa3872dc2
commit
7c4c00649c
|
@ -771,22 +771,12 @@ extern _X_EXPORT int XkbRemoveResourceClient(
|
||||||
XID /* id */
|
XID /* id */
|
||||||
);
|
);
|
||||||
|
|
||||||
extern _X_EXPORT int XkbDDXInitDevice(
|
|
||||||
DeviceIntPtr /* dev */
|
|
||||||
);
|
|
||||||
|
|
||||||
extern _X_EXPORT int XkbDDXAccessXBeep(
|
extern _X_EXPORT int XkbDDXAccessXBeep(
|
||||||
DeviceIntPtr /* dev */,
|
DeviceIntPtr /* dev */,
|
||||||
unsigned int /* what */,
|
unsigned int /* what */,
|
||||||
unsigned int /* which */
|
unsigned int /* which */
|
||||||
);
|
);
|
||||||
|
|
||||||
extern _X_EXPORT void XkbDDXKeyClick(
|
|
||||||
DeviceIntPtr /* dev */,
|
|
||||||
int /* keycode */,
|
|
||||||
int /* synthetic */
|
|
||||||
);
|
|
||||||
|
|
||||||
extern _X_EXPORT int XkbDDXUsesSoftRepeat(
|
extern _X_EXPORT int XkbDDXUsesSoftRepeat(
|
||||||
DeviceIntPtr /* dev */
|
DeviceIntPtr /* dev */
|
||||||
);
|
);
|
||||||
|
|
|
@ -7,8 +7,6 @@ DDX_SRCS = \
|
||||||
ddxBeep.c \
|
ddxBeep.c \
|
||||||
ddxCtrls.c \
|
ddxCtrls.c \
|
||||||
ddxFakeMtn.c \
|
ddxFakeMtn.c \
|
||||||
ddxInit.c \
|
|
||||||
ddxKeyClick.c \
|
|
||||||
ddxLEDs.c \
|
ddxLEDs.c \
|
||||||
ddxLoad.c \
|
ddxLoad.c \
|
||||||
ddxList.c \
|
ddxList.c \
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
/************************************************************
|
|
||||||
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and distribute this
|
|
||||||
software and its documentation for any purpose and without
|
|
||||||
fee is hereby granted, provided that the above copyright
|
|
||||||
notice appear in all copies and that both that copyright
|
|
||||||
notice and this permission notice appear in supporting
|
|
||||||
documentation, and that the name of Silicon Graphics not be
|
|
||||||
used in advertising or publicity pertaining to distribution
|
|
||||||
of the software without specific prior written permission.
|
|
||||||
Silicon Graphics makes no representation about the suitability
|
|
||||||
of this software for any purpose. It is provided "as is"
|
|
||||||
without any express or implied warranty.
|
|
||||||
|
|
||||||
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
||||||
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
||||||
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
||||||
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
||||||
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
||||||
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
||||||
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
||||||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
|
|
||||||
********************************************************/
|
|
||||||
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
|
||||||
#include <dix-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <X11/X.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include <X11/keysym.h>
|
|
||||||
#include "inputstr.h"
|
|
||||||
#include "scrnintstr.h"
|
|
||||||
#include "windowstr.h"
|
|
||||||
#include <xkbsrv.h>
|
|
||||||
#include <X11/extensions/XI.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
XkbDDXInitDevice(DeviceIntPtr dev)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
|
@ -1,45 +0,0 @@
|
||||||
/************************************************************
|
|
||||||
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and distribute this
|
|
||||||
software and its documentation for any purpose and without
|
|
||||||
fee is hereby granted, provided that the above copyright
|
|
||||||
notice appear in all copies and that both that copyright
|
|
||||||
notice and this permission notice appear in supporting
|
|
||||||
documentation, and that the name of Silicon Graphics not be
|
|
||||||
used in advertising or publicity pertaining to distribution
|
|
||||||
of the software without specific prior written permission.
|
|
||||||
Silicon Graphics makes no representation about the suitability
|
|
||||||
of this software for any purpose. It is provided "as is"
|
|
||||||
without any express or implied warranty.
|
|
||||||
|
|
||||||
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
||||||
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
||||||
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
||||||
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
||||||
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
||||||
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
||||||
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
||||||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
|
|
||||||
********************************************************/
|
|
||||||
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
|
||||||
#include <dix-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <X11/X.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include <X11/keysym.h>
|
|
||||||
#include "inputstr.h"
|
|
||||||
#include "scrnintstr.h"
|
|
||||||
#include "windowstr.h"
|
|
||||||
#include <xkbsrv.h>
|
|
||||||
#include <X11/extensions/XI.h>
|
|
||||||
|
|
||||||
void
|
|
||||||
XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
|
@ -132,9 +132,7 @@ xEvent xE;
|
||||||
DebugF("[xkb] AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
|
DebugF("[xkb] AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_XkbIsPressEvent(type))
|
if (!_XkbIsPressEvent(type) && isRepeat)
|
||||||
XkbDDXKeyClick(keybd,keyCode,TRUE);
|
|
||||||
else if (isRepeat)
|
|
||||||
XkbLastRepeatEvent= (pointer)&xE;
|
XkbLastRepeatEvent= (pointer)&xE;
|
||||||
XkbProcessKeyboardEvent(&xE,keybd,1L);
|
XkbProcessKeyboardEvent(&xE,keybd,1L);
|
||||||
XkbLastRepeatEvent= NULL;
|
XkbLastRepeatEvent= NULL;
|
||||||
|
|
|
@ -508,8 +508,6 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
|
||||||
|
|
||||||
XkbInitIndicatorMap(xkbi);
|
XkbInitIndicatorMap(xkbi);
|
||||||
|
|
||||||
XkbDDXInitDevice(dev);
|
|
||||||
|
|
||||||
XkbUpdateActions(dev, xkb->min_key_code, XkbNumKeys(xkb), &changes,
|
XkbUpdateActions(dev, xkb->min_key_code, XkbNumKeys(xkb), &changes,
|
||||||
&check, &cause);
|
&check, &cause);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user