summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2009-01-10 14:44:28 +0200
committerDaniel Stone <daniel@fooishbar.org>2009-01-22 15:08:59 +1100
commit0ec9b1069aeeaf66fd104c09f08202f7ebccd170 (patch)
tree2141d05bb98b0a6852118f7d5b89b3dcb1d0a59e /xkb
parent7af53799ccefe27b996bdc6073075b7f12353d3a (diff)
XKB: Remove unused XkbProcessOtherEvent
Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb')
-rw-r--r--xkb/Makefile.am6
-rw-r--r--xkb/xkbPrOtherEv.c81
2 files changed, 1 insertions, 86 deletions
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index 19d3541a3..b85ee8a41 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -37,11 +37,7 @@ X11_SRCS = \
XKBGAlloc.c \
XKBMAlloc.c
-# ends up unused...
-# XI_SRCS = xkbPrOtherEv.c
-
-libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
- $(X11_SRCS)
+libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)
libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
deleted file mode 100644
index ef8b014ff..000000000
--- a/xkb/xkbPrOtherEv.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/************************************************************
-Copyright (c) 1995 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 <math.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
-#include "misc.h"
-#include "inputstr.h"
-#include "xkbsrv.h"
-
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-
-extern void ProcessOtherEvent(
- xEvent * /* xE */,
- DeviceIntPtr /* dev */,
- int /* count */
-);
-
-/***====================================================================***/
-
-void
-XkbProcessOtherEvent(xEvent *xE,DeviceIntPtr dev,int count)
-{
-Bool xkbCares,isBtn;
-
- xkbCares= True;
- isBtn= False;
- switch ( xE->u.u.type ) {
- case KeyPress: xE->u.u.type= DeviceKeyPress; break;
- case KeyRelease: xE->u.u.type= DeviceKeyRelease; break;
- case ButtonPress: xE->u.u.type= DeviceButtonPress;
- isBtn= True;
- break;
- case ButtonRelease: xE->u.u.type= DeviceButtonRelease;
- isBtn= True;
- break;
- default: xkbCares= False; break;
- }
- if (xkbCares) {
- if ((!isBtn)||((dev->button)&&(dev->button->xkb_acts))) {
- DeviceIntPtr kbd;
- if (dev->key) kbd= dev;
- else kbd= inputInfo.keyboard;
- XkbHandleActions(dev,kbd,xE,count);
- return;
- }
- }
- ProcessOtherEvent(xE,dev,count);
- return;
-}
-