From: Peter Maydell <peter.maydell@linaro.org>
To: Akihiko Odaki <akihiko.odaki@gmail.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: Re: [PATCH] ui/cocoa: Do not rely on the first argument
Date: Tue, 9 Mar 2021 11:12:15 +0000 [thread overview]
Message-ID: <CAFEAcA_VcMD=Arqebgi0b_xLTLOG+M0SQwJJH1PpXLzrkg3fwA@mail.gmail.com> (raw)
In-Reply-To: <20210223110640.73974-1-akihiko.odaki@gmail.com>
On Tue, 23 Feb 2021 at 11:06, Akihiko Odaki <akihiko.odaki@gmail.com> wrote:
>
> The first argument of the executable was used to get its path, but it is
> not reliable because the executer can specify any arbitrary string. Use the
> interfaces provided by QEMU and the platform to get those paths.
>
> This change also changes the icon shown in the "about" window to QEMU's
> cute one.
This patch seems to be doing two things at once:
* we get the executable path via the OSX APIs rather than using argv[0]
* we get an image from the icon directory rather than using the
executable's built-in icon
Please don't put more than one change in the same patch: it makes it
harder to review.
Could you split this up so that there is one patch per change
(ie make it a 2-patch series), please ?
> @@ -1401,18 +1402,13 @@ - (void)make_about_window
> y = about_height - picture_height - 10;
> NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
>
> - /* Get the path to the QEMU binary */
> - NSString *binary_name = [NSString stringWithCString: gArgv[0]
> - encoding: NSASCIIStringEncoding];
> - binary_name = [binary_name lastPathComponent];
> - NSString *program_path = [[NSString alloc] initWithFormat: @"%@/%@",
> - [[NSBundle mainBundle] bundlePath], binary_name];
> -
> /* Make the picture of QEMU */
> NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
> picture_rect];
> - NSImage *qemu_image = [[NSWorkspace sharedWorkspace] iconForFile:
> - program_path];
> + char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
> + NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
> + g_free(qemu_image_path_c);
> + NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
> [picture_view setImage: qemu_image];
> [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
> [superView addSubview: picture_view];
> @@ -1427,9 +1423,7 @@ - (void)make_about_window
> [name_label setBezeled: NO];
> [name_label setDrawsBackground: NO];
> [name_label setAlignment: NSTextAlignmentCenter];
> - NSString *qemu_name = [[NSString alloc] initWithCString: gArgv[0]
> - encoding: NSASCIIStringEncoding];
> - qemu_name = [qemu_name lastPathComponent];
> + NSString *qemu_name = [[[NSBundle mainBundle] executablePath] lastPathComponent];
The API docs for NSBundle mainBundle say it can return nil and you
always have to check the return value.
https://developer.apple.com/documentation/foundation/nsbundle/1410786-mainbundle
It's not clear to me what the fallback should be if it does return nil...
> [name_label setStringValue: qemu_name];
> [superView addSubview: name_label];
>
> --
> 2.24.3 (Apple Git-128)
thanks
-- PMM
prev parent reply other threads:[~2021-03-09 11:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 11:06 [PATCH] ui/cocoa: Do not rely on the first argument Akihiko Odaki
2021-02-24 11:55 ` Gerd Hoffmann
2021-03-09 11:12 ` Peter Maydell [this message]
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='CAFEAcA_VcMD=Arqebgi0b_xLTLOG+M0SQwJJH1PpXLzrkg3fwA@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=akihiko.odaki@gmail.com \
--cc=kraxel@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.