summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Marineau <marineam@gentoo.org>2007-04-26 21:21:34 +0000
committerMichael Marineau <marineam@gentoo.org>2007-04-26 21:21:34 +0000
commit77498ba8fd650b3bbf566bf2bea8035ea6e0f297 (patch)
tree2aa582ece34c185af2da7ed8dff1d6fc978b7209 /app-emulation
parentBump xen-sources to 2.6.16.49 (diff)
downloadxen-77498ba8fd650b3bbf566bf2bea8035ea6e0f297.tar.gz
xen-77498ba8fd650b3bbf566bf2bea8035ea6e0f297.tar.bz2
xen-77498ba8fd650b3bbf566bf2bea8035ea6e0f297.zip
Fix the xen remove mintor mode patch, now typing works.
svn path=/xen/; revision=24
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-tools/Manifest8
-rw-r--r--app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch107
2 files changed, 14 insertions, 101 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index accb5b8..1527df0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -10,10 +10,10 @@ AUX 3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb
MD5 2812525317e8827f626962738e4643d4 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
-AUX 3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 2840 RMD160 b02c4d1604419b09383d333049e334528894e02e SHA1 eafcf4a5c010dd237f3a54fd6c92adcd2468c946 SHA256 08f61f019a66d6f0646cc6e88553d80df2fc85995d2ea3365648466c77fdae69
-MD5 48a6dffdd5647812cb4ac31002ff956c files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 2840
-RMD160 b02c4d1604419b09383d333049e334528894e02e files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 2840
-SHA256 08f61f019a66d6f0646cc6e88553d80df2fc85995d2ea3365648466c77fdae69 files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 2840
+AUX 3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592 RMD160 a7b29d6563c2124d218658d56083c2847a9a287a SHA1 a92ed78cfc1dd04f7342a58e725f5279af84a14d SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389
+MD5 8cefd2566392cb8a27190b54dfaa0620 files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
+RMD160 a7b29d6563c2124d218658d56083c2847a9a287a files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
+SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389 files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
AUX 3.0.4_p1/xen-tools-vnclisten.patch 519 RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 SHA1 95e37aa7d92fcd87616a39be032bc91c18077881 SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb
MD5 423ad930eef2e40ee30b6f648f0340f2 files/3.0.4_p1/xen-tools-vnclisten.patch 519
RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 files/3.0.4_p1/xen-tools-vnclisten.patch 519
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)