aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChristian Limpach <Christian.Limpach@xensource.com>2007-03-28 10:05:37 +0100
committerChristian Limpach <Christian.Limpach@xensource.com>2007-03-28 10:05:37 +0100
commit7575ba257f9b0ba1e2b74be695322962650c6a0f (patch)
treee01e3380d53498865df33fd902f934583ba3f9be /tools
parentd3454d2db9d79cb51165377673ca286ca4d01fc6 (diff)
downloadxen-7575ba257f9b0ba1e2b74be695322962650c6a0f.tar.gz
xen-7575ba257f9b0ba1e2b74be695322962650c6a0f.tar.bz2
xen-7575ba257f9b0ba1e2b74be695322962650c6a0f.zip
[ioemu] Revert 14585:3375391fb0c9 since this removes useful functionality.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/ioemu/Makefile.target4
-rw-r--r--tools/ioemu/vnc.c9
2 files changed, 0 insertions, 13 deletions
diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index becb331238..4872128d20 100644
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -193,10 +193,6 @@ ifdef CONFIG_SOLARIS
LIBS+=-lsocket -lnsl -lresolv
endif
-ifeq ($(debug),y)
-CFLAGS += -DQEMU_VNC_MONITOR_EXPORT
-endif
-
# profiling code
ifdef TARGET_GPROF
LDFLAGS+=-p
diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
index ac3b43351c..d06b47a220 100644
--- a/tools/ioemu/vnc.c
+++ b/tools/ioemu/vnc.c
@@ -113,10 +113,8 @@ struct VncState
int visible_w;
int visible_h;
-#ifdef QEMU_VNC_MONITOR_EXPORT
int ctl_keys; /* Ctrl+Alt starts calibration */
int shift_keys; /* Shift / CapsLock keys */
-#endif
int numlock;
};
@@ -897,7 +895,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
kbd_put_keycode(keycode & 0x7f);
else
kbd_put_keycode(keycode | 0x80);
-#ifdef QEMU_VNC_MONITOR_EXPORT
} else if (down) {
int qemu_keysym = 0;
@@ -925,10 +922,8 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
}
if (qemu_keysym != 0)
kbd_put_keysym(qemu_keysym);
-#endif
}
-#ifdef QEMU_VNC_MONITOR_EXPORT
if (down) {
switch (sym) {
case XK_Control_L:
@@ -981,10 +976,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
break;
}
}
-#else
- if (!down && sym == XK_Num_Lock)
- vs->numlock = !vs->numlock;
-#endif
}
static void key_event(VncState *vs, int down, uint32_t sym)