From 75f0c8715a8127800e620c9fd48da4f691c236af Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mar 24 2014 17:20:43 +0000
Subject: Change gtk quit accelerator to ctrl+shift+q (bz #1062393)

Fix mouse with spice
Enable xen support for xen 4.4

---

diff --git a/0001-Change-gtk-quit-accelerator-to-ctrl-shift-q-bz-10623.patch b/0001-Change-gtk-quit-accelerator-to-ctrl-shift-q-bz-10623.patch
new file mode 100644
index 0000000..338fd3e
--- /dev/null
+++ b/0001-Change-gtk-quit-accelerator-to-ctrl-shift-q-bz-10623.patch
@@ -0,0 +1,37 @@
+From aaf9408dd279d9aa0bf1af6da07813a274fcb530 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 19 Mar 2014 14:57:27 -0400
+Subject: [PATCH] Change gtk quit accelerator to ctrl+shift+q (bz 1062393)
+
+Similar patches queued for 2.1
+---
+ ui/gtk.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/ui/gtk.c b/ui/gtk.c
+index c3ac448..0500134 100644
+--- a/ui/gtk.c
++++ b/ui/gtk.c
+@@ -1293,7 +1293,6 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s, GtkAccelGroup *acce
+ {
+     GtkWidget *machine_menu;
+     GtkWidget *separator;
+-    GtkStockItem item;
+ 
+     machine_menu = gtk_menu_new();
+     gtk_menu_set_accel_group(GTK_MENU(machine_menu), accel_group);
+@@ -1313,11 +1312,11 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s, GtkAccelGroup *acce
+     separator = gtk_separator_menu_item_new();
+     gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), separator);
+ 
+-    s->quit_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
+-    gtk_stock_lookup(GTK_STOCK_QUIT, &item);
++    s->quit_item = gtk_menu_item_new_with_mnemonic(_("_Quit"));
+     gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->quit_item),
+                                  "<QEMU>/Machine/Quit");
+-    gtk_accel_map_add_entry("<QEMU>/Machine/Quit", item.keyval, item.modifier);
++    gtk_accel_map_add_entry("<QEMU>/Machine/Quit",
++                            GDK_KEY_q, HOTKEY_MODIFIERS);
+     gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->quit_item);
+ 
+     return machine_menu;
diff --git a/0002-spice-input-Fix-absolute-mouse-y-coordinates.patch b/0002-spice-input-Fix-absolute-mouse-y-coordinates.patch
new file mode 100644
index 0000000..2286392
--- /dev/null
+++ b/0002-spice-input-Fix-absolute-mouse-y-coordinates.patch
@@ -0,0 +1,25 @@
+From 60fd6c348917c108fccc50bb5a3e8805275eed64 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 21 Mar 2014 14:27:05 -0400
+Subject: [PATCH] spice: input: Fix absolute mouse y coordinates
+
+Current tablet + spice is unusable. Regressed with the UI input rework.
+
+(cherry picked from commit 2445826353f0c65fd9920260f682fb725a36b399)
+---
+ ui/spice-input.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/spice-input.c b/ui/spice-input.c
+index 6dab23b..c342e0d 100644
+--- a/ui/spice-input.c
++++ b/ui/spice-input.c
+@@ -176,7 +176,7 @@ static void tablet_position(SpiceTabletInstance* sin, int x, int y,
+ 
+     spice_update_buttons(pointer, 0, buttons_state);
+     qemu_input_queue_abs(NULL, INPUT_AXIS_X, x, pointer->width);
+-    qemu_input_queue_abs(NULL, INPUT_AXIS_Y, y, pointer->width);
++    qemu_input_queue_abs(NULL, INPUT_AXIS_Y, y, pointer->height);
+     qemu_input_event_sync();
+ }
+ 
diff --git a/qemu.spec b/qemu.spec
index 8815e10..8d3133b 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -188,6 +188,13 @@ Source12: bridge.conf
 # qemu-kvm back compat wrapper
 Source13: qemu-kvm.sh
 
+# Change gtk quit accelerator to ctrl+shift+q (bz #1062393)
+# Patches queued for 2.1
+Patch0001: 0001-Change-gtk-quit-accelerator-to-ctrl-shift-q-bz-10623.patch
+# Fix mouse with spice
+# Patches queued for 2.0
+Patch0002: 0002-spice-input-Fix-absolute-mouse-y-coordinates.patch
+
 BuildRequires: SDL2-devel
 BuildRequires: zlib-devel
 BuildRequires: which
@@ -693,6 +700,13 @@ CAC emulation development files.
 %prep
 %setup -q -n qemu-2.0.0-rc0
 
+# Change gtk quit accelerator to ctrl+shift+q (bz #1062393)
+# Patches queued for 2.1
+%patch0001 -p1
+# Fix mouse with spice
+# Patches queued for 2.0
+%patch0002 -p1
+
 
 %build
 %if %{with kvmonly}
@@ -1444,6 +1458,8 @@ getent passwd qemu >/dev/null || \
 
 %changelog
 * Mon Mar 24 2014 Cole Robinson <crobinso@redhat.com> - 2:2.0.0-0.2.rc0
+- Change gtk quit accelerator to ctrl+shift+q (bz #1062393)
+- Fix mouse with spice
 - Enable xen support for xen 4.4
 
 * Tue Mar 18 2014 Cole Robinson <crobinso@redhat.com> 2:2.0.0-0.1.rc0