# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1175072737 -3600
# Node ID 3d7a4ac397b12490653f77af5536b794b01c482b
# Parent ff6a1607c17b2e1f2e8b09e8722097f50e16c715
[ioemu] Revert 14585:3375391fb0c9 since this removes useful functionality.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
tools/ioemu/Makefile.target | 4 ----
tools/ioemu/vnc.c | 13 ++-----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff -r ff6a1607c17b -r 3d7a4ac397b1 tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target Wed Mar 28 09:12:16 2007 +0000
+++ b/tools/ioemu/Makefile.target Wed Mar 28 10:05:37 2007 +0100
@@ -193,10 +193,6 @@ LIBS+=-lsocket -lnsl -lresolv
LIBS+=-lsocket -lnsl -lresolv
endif
-ifeq ($(debug),y)
-CFLAGS += -DQEMU_VNC_MONITOR_EXPORT
-endif
-
# profiling code
ifdef TARGET_GPROF
LDFLAGS+=-p
diff -r ff6a1607c17b -r 3d7a4ac397b1 tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c Wed Mar 28 09:12:16 2007 +0000
+++ b/tools/ioemu/vnc.c Wed Mar 28 10:05:37 2007 +0100
@@ -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, i
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, i
}
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, i
break;
}
}
-#else
- if (!down && sym == XK_Num_Lock)
- vs->numlock = !vs->numlock;
-#endif
}
static void key_event(VncState *vs, int down, uint32_t sym)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home