summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2010-05-10 11:48:31 -0400
committerKeith Packard <keithp@keithp.com>2010-05-21 12:49:46 -0700
commit9d31d5b639c2a6ab8b1a80a0e2f0ee2c4f8cddd3 (patch)
tree357008bf143d3026c50cdaabf1d58bc6f8773d9b
parentd8cbcbc01d1355d55c1c0af64f7f7f61629f6c61 (diff)
vfb: Remove dead variable and header file
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--hw/vfb/InitInput.c2
-rw-r--r--hw/vfb/Makefile.am1
-rw-r--r--hw/vfb/lk201kbd.h158
3 files changed, 0 insertions, 161 deletions
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 10bb6a599..801aaa0b4 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -38,7 +38,6 @@ from The Open Group.
#include <X11/Xos.h>
#include "mibstore.h"
#include "mipointer.h"
-#include "lk201kbd.h"
#include "xkbsrv.h"
#include <X11/keysym.h>
#include "xserver-properties.h"
@@ -63,7 +62,6 @@ void DDXRingBell(int volume, int pitch, int duration)
#define VFB_MIN_KEY 8
#define VFB_MAX_KEY 255
-KeySym map[MAP_LENGTH * LK201_GLYPHS_PER_KEY];
static int
vfbKeybdProc(DeviceIntPtr pDevice, int onoff)
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 4ac0c8f89..de5e1c5c9 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -9,7 +9,6 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
SRCS = InitInput.c \
InitOutput.c \
- lk201kbd.h \
$(top_srcdir)/Xext/dpmsstubs.c \
$(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c
diff --git a/hw/vfb/lk201kbd.h b/hw/vfb/lk201kbd.h
deleted file mode 100644
index d0198d06b..000000000
--- a/hw/vfb/lk201kbd.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-******************************************************************/
-
-
-#define MIN_LK201_KEY 86
-#define MAX_LK201_KEY 251
-#define LK201_GLYPHS_PER_KEY 2
-
-#define KEY_F1 86
-#define KEY_F2 87
-#define KEY_F3 88
-#define KEY_F4 89
-#define KEY_F5 90
-#define KEY_F6 100
-#define KEY_F7 101
-#define KEY_F8 102
-#define KEY_F9 103
-#define KEY_F10 104
-#define KEY_F11 113
-#define KEY_F12 114
-#define KEY_F13 115
-#define KEY_F14 116
-#define KEY_HELP 124
-#define KEY_MENU 125
-#define KEY_F17 128
-#define KEY_F18 129
-#define KEY_F19 130
-#define KEY_F20 131
-#define KEY_FIND 138
-#define KEY_INSERT_HERE 139
-#define KEY_REMOVE 140
-#define KEY_SELECT 141
-#define KEY_PREV_SCREEN 142
-#define KEY_NEXT_SCREEN 143
-#define KEY_KP_0 146 /* key pad */
-#define KEY_KP_PERIOD 148 /* key pad */
-#define KEY_KP_ENTER 149 /* key pad */
-#define KEY_KP_1 150 /* key pad */
-#define KEY_KP_2 151 /* key pad */
-#define KEY_KP_3 152 /* key pad */
-#define KEY_KP_4 153 /* key pad */
-#define KEY_KP_5 154 /* key pad */
-#define KEY_KP_6 155 /* key pad */
-#define KEY_KP_COMMA 156 /* key pad */
-#define KEY_KP_7 157 /* key pad */
-#define KEY_KP_8 158 /* key pad */
-#define KEY_KP_9 159 /* key pad */
-#define KEY_KP_HYPHEN 160
-#define KEY_KP_PF1 161
-#define KEY_KP_PF2 162
-#define KEY_KP_PF3 163
-#define KEY_KP_PF4 164
-#define KEY_LEFT 167
-#define KEY_RIGHT 168
-#define KEY_DOWN 169
-#define KEY_UP 170
-#define KEY_SHIFT 174
-#define KEY_CTRL 175
-#define KEY_LOCK 176
-#define KEY_COMPOSE 177
-#define KEY_APPLE 177
-#define KEY_META 177
-#define KEY_DELETE 188
-#define KEY_RETURN 189
-#define KEY_TAB 190
-#define KEY_TILDE 191
-#define KEY_TR_1 192 /* Top Row */
-#define KEY_Q 193
-#define KEY_A 194
-#define KEY_Z 195
-#define KEY_TR_2 197
-#define KEY_W 198
-#define KEY_S 199
-#define KEY_X 200
-#define KEY_LANGLE_RANGLE 201 /* xxx */
-#define KEY_TR_3 203
-#define KEY_E 204
-#define KEY_D 205
-#define KEY_C 206
-#define KEY_TR_4 208
-#define KEY_R 209
-#define KEY_F 210
-#define KEY_V 211
-#define KEY_SPACE 212
-#define KEY_TR_5 214
-#define KEY_T 215
-#define KEY_G 216
-#define KEY_B 217
-#define KEY_TR_6 219
-#define KEY_Y 220
-#define KEY_H 221
-#define KEY_N 222
-#define KEY_TR_7 224
-#define KEY_U 225
-#define KEY_J 226
-#define KEY_M 227
-#define KEY_TR_8 229
-#define KEY_I 230
-#define KEY_K 231
-#define KEY_COMMA 232 /* xxx */
-#define KEY_TR_9 234
-#define KEY_O 235
-#define KEY_L 236
-#define KEY_PERIOD 237 /* xxx */
-#define KEY_TR_0 239
-#define KEY_P 240
-#define KEY_SEMICOLON 242 /* xxx */
-#define KEY_QMARK 243
-#define KEY_PLUS 245 /* xxx */
-#define KEY_RBRACE 246
-#define KEY_VBAR 247 /* xxx */
-#define KEY_UBAR 249 /* xxx */
-#define KEY_LBRACE 250
-#define KEY_QUOTE 251