Fix the xen remove mintor mode patch, now typing works.

svn path=/xen/; revision=24

1 files changed, 10 insertions, 97 deletions

diff --git a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch
index 771b626..07e9735 100644
--- a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch
+++ b/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch
@@ -1,96 +1,11 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/ioemu/vnc.c xen-3.0.4_1-src/tools/ioemu/vnc.c
---- xen-3.0.4_1-src.orig/tools/ioemu/vnc.c	2007-01-08 07:00:49.000000000 -0800
-+++ xen-3.0.4_1-src/tools/ioemu/vnc.c	2007-04-10 16:57:55.000000000 -0700
-@@ -113,8 +113,6 @@ struct VncState
-     int visible_w;
-     int visible_h;
- 
--    int ctl_keys;               /* Ctrl+Alt starts calibration */
--    int shift_keys;             /* Shift / CapsLock keys */
-     int numlock;
- };
- 
-@@ -863,9 +861,6 @@ static void press_key(VncState *vs, int 
- 
- static void do_key_event(VncState *vs, int down, uint32_t sym)
- {
--    sym &= 0xFFFF;
--
--    if (is_graphic_console()) {
- 	int keycode;
- 	int numlock;
- 
-@@ -895,87 +890,6 @@ static void do_key_event(VncState *vs, i
- 	    kbd_put_keycode(keycode & 0x7f);
- 	else
- 	    kbd_put_keycode(keycode | 0x80);
--    } else if (down) {
--	int qemu_keysym = 0;
--
--	if (sym <= 128) { /* normal ascii */
--	    int shifted = vs->shift_keys == 1 || vs->shift_keys == 2;
--	    qemu_keysym = sym;
--	    if (sym >= 'a' && sym <= 'z' && shifted)
--	        qemu_keysym -= 'a' - 'A';
--	} else {
--	    switch (sym) {
--	    case XK_Up: qemu_keysym = QEMU_KEY_UP; break;
--	    case XK_Down: qemu_keysym = QEMU_KEY_DOWN; break;
--	    case XK_Left: qemu_keysym = QEMU_KEY_LEFT; break;
--	    case XK_Right: qemu_keysym = QEMU_KEY_RIGHT; break;
--	    case XK_Home: qemu_keysym = QEMU_KEY_HOME; break;
--	    case XK_End: qemu_keysym = QEMU_KEY_END; break;
--	    case XK_Page_Up: qemu_keysym = QEMU_KEY_PAGEUP; break;
--	    case XK_Page_Down: qemu_keysym = QEMU_KEY_PAGEDOWN; break;
--	    case XK_BackSpace: qemu_keysym = QEMU_KEY_BACKSPACE; break;
--	    case XK_Delete: qemu_keysym = QEMU_KEY_DELETE; break;
--	    case XK_Return:
--	    case XK_Linefeed: qemu_keysym = sym; break;
--	    default: break;
--	    }
--	}
--	if (qemu_keysym != 0)
--	    kbd_put_keysym(qemu_keysym);
--    }
--
--    if (down) {
--	switch (sym) {
--	case XK_Control_L:
--	    vs->ctl_keys |= 1;
--	    break;
--
--	case XK_Alt_L:
--	    vs->ctl_keys |= 2;
--	    break;
--
--	case XK_Shift_L:
--	    vs->shift_keys |= 1;
--	    break;
--
--	default:
--	    break;
--	}
--    } else {
--	switch (sym) {
--	case XK_Control_L:
--	    vs->ctl_keys &= ~1;
--	    break;
--
--	case XK_Alt_L:
--	    vs->ctl_keys &= ~2;
--	    break;
--
--	case XK_Shift_L:
--	    vs->shift_keys &= ~1;
--	    break;
--
--	case XK_Caps_Lock:
--	    vs->shift_keys ^= 2;
--	    break;
--
--	case XK_Num_Lock:
--	    vs->numlock = !vs->numlock;
--	    break;
+diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
+index 6d7cc31..9e2d535 100644
+--- a/tools/ioemu/vnc.c
++++ b/tools/ioemu/vnc.c
+@@ -962,18 +962,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
+ 	case XK_Num_Lock:
+ 	    vs->numlock = !vs->numlock;
+ 	    break;
 -
 -	case XK_1 ... XK_9:
 -	    if ((vs->ctl_keys & 3) != 3)
@@ -103,8 +18,6 @@ diff -rpuN xen-3.0.4_1-src.orig/tools/ioemu/vnc.c xen-3.0.4_1-src/tools/ioemu/vn
 -		vnc_dpy_update(vs->ds, 0, 0, vs->ds->width, vs->ds->height);
 -	    }
 -	    break;
--	}
--    }
+ 	}
+     }
  }
- 
- static void key_event(VncState *vs, int down, uint32_t sym)