qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	libvir-list@redhat.com, Markus Armbruster <armbru@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 07/10] ui/gtk: implement show-cursor option
Date: Wed, 12 Feb 2020 17:18:32 +0100	[thread overview]
Message-ID: <20200212161835.28576-8-kraxel@redhat.com> (raw)
In-Reply-To: <20200212161835.28576-1-kraxel@redhat.com>

When specified just set null_cursor to NULL so we get the default
pointer instead of a blank pointer.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 ui/gtk.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 850c49bee02a..f3f0af8921d9 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2246,8 +2246,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     textdomain("qemu");
 
     window_display = gtk_widget_get_display(s->window);
-    s->null_cursor = gdk_cursor_new_for_display(window_display,
-                                                GDK_BLANK_CURSOR);
+    if (s->opts->has_show_cursor && s->opts->show_cursor) {
+        s->null_cursor = NULL; /* default pointer */
+    } else {
+        s->null_cursor = gdk_cursor_new_for_display(window_display,
+                                                    GDK_BLANK_CURSOR);
+    }
 
     s->mouse_mode_notifier.notify = gd_mouse_mode_change;
     qemu_add_mouse_mode_change_notifier(&s->mouse_mode_notifier);
-- 
2.18.2



  parent reply	other threads:[~2020-02-12 16:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-12 16:18 [PULL 00/10] Ui 20200212 patches Gerd Hoffmann
2020-02-12 16:18 ` [PULL 01/10] ui/gtk: Update gd_refresh_rate_millihz() to handle VirtualConsole Gerd Hoffmann
2020-02-12 16:18 ` [PULL 02/10] ui/gtk: Fix gd_refresh_rate_millihz() when widget window is not realized Gerd Hoffmann
2020-02-12 16:18 ` [PULL 03/10] ui: add show-cursor option Gerd Hoffmann
2020-02-12 16:18 ` [PULL 04/10] ui: wire up legacy -show-cursor option Gerd Hoffmann
2020-02-12 16:18 ` [PULL 05/10] ui/sdl: switch to new show-cursor option Gerd Hoffmann
2020-02-12 16:18 ` [PULL 06/10] ui/cocoa: " Gerd Hoffmann
2020-02-12 16:18 ` Gerd Hoffmann [this message]
2020-02-12 16:18 ` [PULL 08/10] ui: drop curor_hide global variable Gerd Hoffmann
2020-02-12 16:18 ` [PULL 09/10] ui: deprecate legacy -show-cursor option Gerd Hoffmann
2020-02-12 16:18 ` [PULL 10/10] ui/cocoa: Drop workarounds for pre-10.12 OSX Gerd Hoffmann
2020-02-13 13:40 ` [PULL 00/10] Ui 20200212 patches 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=20200212161835.28576-8-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=armbru@redhat.com \
    --cc=libvir-list@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).