motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-26 11:32:23 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui/cocoa: add zoom-interpolation display option

Browse source 
Provides a new display option, zoom-interpolation, that enables
interpolation of the scaled display when zoom-to-fit is enabled.

Also provides a corresponding view menu item to allow this to be toggled
as required.

Signed-off-by: Carwyn Ellis <carwynellis@gmail.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20231110161729.36822-2-carwynellis@gmail.com>
[PMD: QAPI @zoom-interpolation since 9.0]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Carwyn Ellis 2023-11-10 16:17:29 +00:00 • committed by Philippe Mathieu-Daudé
parent 52e7db443b
commit e28a909a19
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qapi/ui.json
View file

@ -1428,6 +1428,9 @@
# turned off the host window will be resized instead. Defaults to # turned off the host window will be resized instead. Defaults to
# "off". (Since 8.2) # "off". (Since 8.2)
# #
# @zoom-interpolation: Apply interpolation to smooth output when
# zoom-to-fit is enabled. Defaults to "off". (Since 9.0)
#
# Since: 7.0 # Since: 7.0
## ##
{ 'struct': 'DisplayCocoa', { 'struct': 'DisplayCocoa',
@ -1435,7 +1438,8 @@
'*left-command-key': 'bool', '*left-command-key': 'bool',
'*full-grab': 'bool', '*full-grab': 'bool',
'*swap-opt-cmd': 'bool', '*swap-opt-cmd': 'bool',
'*zoom-to-fit': 'bool' '*zoom-to-fit': 'bool',
'*zoom-interpolation': 'bool'
} } } }
## ##

21
ui/cocoa.m
View file

@ -105,6 +105,7 @@ static int left_command_key_enabled = 1;
static bool swap_opt_cmd; static bool swap_opt_cmd;
static bool stretch_video; static bool stretch_video;
static CGInterpolationQuality zoom_interpolation = kCGInterpolationNone;
static NSTextField *pauseLabel; static NSTextField *pauseLabel;
static bool allow_events; static bool allow_events;
@ -455,7 +456,7 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
// get CoreGraphic context // get CoreGraphic context
CGContextRef viewContextRef = [[NSGraphicsContext currentContext] CGContext]; CGContextRef viewContextRef = [[NSGraphicsContext currentContext] CGContext];
CGContextSetInterpolationQuality (viewContextRef, kCGInterpolationNone); CGContextSetInterpolationQuality (viewContextRef, zoom_interpolation);
CGContextSetShouldAntialias (viewContextRef, NO); CGContextSetShouldAntialias (viewContextRef, NO);
// draw screen bitmap directly to Core Graphics context // draw screen bitmap directly to Core Graphics context
@ -1411,6 +1412,17 @@ static CGEventRef handleTapEvent(CGEventTapProxy proxy, CGEventType type, CGEven
} }
} }
- (void)toggleZoomInterpolation:(id) sender
{
if (zoom_interpolation == kCGInterpolationNone) {
zoom_interpolation = kCGInterpolationLow;
[sender setState: NSControlStateValueOn];
} else {
zoom_interpolation = kCGInterpolationNone;
[sender setState: NSControlStateValueOff];
}
}
/* Displays the console on the screen */ /* Displays the console on the screen */
- (void)displayConsole:(id)sender - (void)displayConsole:(id)sender
{ {
@ -1673,6 +1685,9 @@ static void create_initial_menus(void)
menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom To Fit" action:@selector(zoomToFit:) keyEquivalent:@""] autorelease]; menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom To Fit" action:@selector(zoomToFit:) keyEquivalent:@""] autorelease];
[menuItem setState: stretch_video ? NSControlStateValueOn : NSControlStateValueOff]; [menuItem setState: stretch_video ? NSControlStateValueOn : NSControlStateValueOff];
[menu addItem: menuItem]; [menu addItem: menuItem];
menuItem = [[[NSMenuItem alloc] initWithTitle:@"Zoom Interpolation" action:@selector(toggleZoomInterpolation:) keyEquivalent:@""] autorelease];
[menuItem setState: zoom_interpolation == kCGInterpolationLow ? NSControlStateValueOn : NSControlStateValueOff];
[menu addItem: menuItem];
menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease]; menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu]; [menuItem setSubmenu:menu];
[[NSApp mainMenu] addItem:menuItem]; [[NSApp mainMenu] addItem:menuItem];
@ -2070,6 +2085,10 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
stretch_video = true; stretch_video = true;
} }
if (opts->u.cocoa.has_zoom_interpolation && opts->u.cocoa.zoom_interpolation) {
zoom_interpolation = kCGInterpolationLow;
}
create_initial_menus(); create_initial_menus();
/* /*
* Create the menu entries which depend on QEMU state (for consoles * Create the menu entries which depend on QEMU state (for consoles