qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ziyue Yang <yzylivezh@hotmail.com>,
	Ziyue Yang <skiver.cloud.yzy@gmail.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL v2 07/11] ui/gtk.c: add ctrl-alt-= support for zoom in acceleration
Date: Tue, 31 Jan 2017 16:50:27 +0100	[thread overview]
Message-ID: <1485877831-28786-8-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1485877831-28786-1-git-send-email-kraxel@redhat.com>

From: Ziyue Yang <yzylivezh@hotmail.com>

Solving wishlist item at
https://bugs.launchpad.net/qemu/+bug/1656710
by accepting Ctrl-Alt-= as an additional zoom-in acceleration.

Using gtk_accel_group_connect to support multiple accelerations
triggering a single menu item since that gtk_accel_map_add_entry
seems to support only one acceleration. A wrapper function
gd_accel_zoom_in is added to support gtk_accel_group_connect's
callback activities.

Signed-off-by: Ziyue Yang <skiver.cloud.yzy@gmail.com>
Message-id: 1485826335-15686-1-git-send-email-skiver.cloud.yzy@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/gtk.c b/ui/gtk.c
index 2f81863..b734c0b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -105,6 +105,7 @@
 #define GDK_KEY_g GDK_g
 #define GDK_KEY_q GDK_q
 #define GDK_KEY_plus GDK_plus
+#define GDK_KEY_equal GDK_equal
 #define GDK_KEY_minus GDK_minus
 #define GDK_KEY_Pause GDK_Pause
 #define GDK_KEY_Delete GDK_Delete
@@ -1342,6 +1343,12 @@ static void gd_menu_zoom_in(GtkMenuItem *item, void *opaque)
     gd_update_windowsize(vc);
 }
 
+static void gd_accel_zoom_in(void *opaque)
+{
+    GtkDisplayState *s = opaque;
+    gtk_menu_item_activate(GTK_MENU_ITEM(s->zoom_in_item));
+}
+
 static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque)
 {
     GtkDisplayState *s = opaque;
@@ -2109,6 +2116,8 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s)
                                  "<QEMU>/View/Zoom In");
     gtk_accel_map_add_entry("<QEMU>/View/Zoom In", GDK_KEY_plus,
                             HOTKEY_MODIFIERS);
+    gtk_accel_group_connect(s->accel_group, GDK_KEY_equal, HOTKEY_MODIFIERS, 0,
+            g_cclosure_new_swap(G_CALLBACK(gd_accel_zoom_in), s, NULL));
     gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), s->zoom_in_item);
 
     s->zoom_out_item = gtk_menu_item_new_with_mnemonic(_("Zoom _Out"));
-- 
1.8.3.1

  parent reply	other threads:[~2017-01-31 15:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-31 15:50 [Qemu-devel] [PULL v2 00/11] ui patch queue Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 01/11] qapi: add support for mice with extra/side buttons Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 02/11] ps2: " Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 03/11] ui: " Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 04/11] vnc: track LED state separately Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 05/11] ui/gtk: Fix mouse wheel on 3.4.0 or later Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 06/11] ui: fix format specfier in vnc to avoid break in build Gerd Hoffmann
2017-01-31 15:50 ` Gerd Hoffmann [this message]
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 08/11] spice: wakeup QXL worker to pick up mouse changes Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 09/11] vnc: fix overflow in vnc_update_stats Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 10/11] gtk: Hardcode LC_CTYPE as C.utf-8 Gerd Hoffmann
2017-01-31 15:50 ` [Qemu-devel] [PULL v2 11/11] console: fix console resize Gerd Hoffmann
2017-01-31 16:22 ` [Qemu-devel] [PULL v2 00/11] ui patch queue Peter Maydell
2017-01-31 16:34   ` Gerd Hoffmann
2017-02-02  9:49 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1485877831-28786-8-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=skiver.cloud.yzy@gmail.com \
    --cc=yzylivezh@hotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).