From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrZBh-0003Nt-F3 for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:18:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrZBc-0006i6-QR for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:18:17 -0500 Received: from v220110690675601.yourvserver.net ([37.221.199.173]:55406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrZBc-0006hv-HE for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:18:12 -0500 Message-ID: <52AB6B7F.6000506@weilnetz.de> Date: Fri, 13 Dec 2013 21:18:07 +0100 From: Stefan Weil MIME-Version: 1.0 References: <1386543546-31919-1-git-send-email-peter.maydell@linaro.org> <1386543546-31919-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1386543546-31919-3-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/5] ui/cocoa: Correct typos in comments and variable names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , patches@linaro.org Am 08.12.2013 23:59, schrieb Peter Maydell: > Fix various non-user-visible typos in comments and variable names. > > Signed-off-by: Peter Maydell > --- > ui/cocoa.m | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index d38cf22..f55747f 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -52,7 +52,7 @@ > #define COCOA_MOUSE_EVENT \ > if (isTabletEnabled) { \ > kbd_mouse_event((int)(p.x * 0x7FFF / (screen.width - 1)), (int)((screen.height - p.y) * 0x7FFF / (screen.height - 1)), 0, buttons); \ > - } else if (isMouseGrabed) { \ > + } else if (isMouseGrabbed) { \ > kbd_mouse_event((int)[event deltaX], (int)[event deltaY], 0, buttons); \ > } else { \ > [NSApp sendEvent:event]; \ > @@ -204,7 +204,7 @@ int keymap[] = > 200,// 126 0x7E 0xc8 E0,48 U ARROW QZ_UP > /* completed according to http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzKeys.h?rev=1.6&content-type=text/x-cvsweb-markup */ > > -/* Aditional 104 Key XP-Keyboard Scancodes from http://www.computer-engineering.org/ps2keyboard/scancodes1.html */ > +/* Additional 104 Key XP-Keyboard Scancodes from http://www.computer-engineering.org/ps2keyboard/scancodes1.html */ > /* > 221 // 0xdd e0,5d APPS > // E0,2A,E0,37 PRNT SCRN > @@ -260,7 +260,7 @@ static int cocoa_keycode_to_qemu(int keycode) > float cx,cy,cw,ch,cdx,cdy; > CGDataProviderRef dataProviderRef; > int modifiers_state[256]; > - BOOL isMouseGrabed; > + BOOL isMouseGrabbed; > BOOL isFullscreen; > BOOL isAbsoluteEnabled; > BOOL isTabletEnabled; > @@ -271,7 +271,7 @@ static int cocoa_keycode_to_qemu(int keycode) > - (void) toggleFullScreen:(id)sender; > - (void) handleEvent:(NSEvent *)event; > - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled; > -- (BOOL) isMouseGrabed; > +- (BOOL) isMouseGrabbed; > - (BOOL) isAbsoluteEnabled; > - (float) cdx; > - (float) cdy; > @@ -493,7 +493,7 @@ QemuCocoaView *cocoaView; > case NSFlagsChanged: > keycode = cocoa_keycode_to_qemu([event keyCode]); > > - if ((keycode == 219 || keycode == 220) && !isMouseGrabed) { > + if ((keycode == 219 || keycode == 220) && !isMouseGrabbed) { > /* Don't pass command key changes to guest unless mouse is grabbed */ > keycode = 0; > } > @@ -524,7 +524,7 @@ QemuCocoaView *cocoaView; > keycode = cocoa_keycode_to_qemu([event keyCode]); > > // forward command key combos to the host UI unless the mouse is grabbed > - if (!isMouseGrabed && ([event modifierFlags] & NSCommandKeyMask)) { > + if (!isMouseGrabbed && ([event modifierFlags] & NSCommandKeyMask)) { > [NSApp sendEvent:event]; > return; > } > @@ -588,7 +588,7 @@ QemuCocoaView *cocoaView; > > // don't pass the guest a spurious key-up if we treated this > // command-key combo as a host UI action > - if (!isMouseGrabed && ([event modifierFlags] & NSCommandKeyMask)) { > + if (!isMouseGrabbed && ([event modifierFlags] & NSCommandKeyMask)) { > return; > } > > @@ -649,7 +649,7 @@ QemuCocoaView *cocoaView; > case NSLeftMouseUp: > if (isTabletEnabled) { > COCOA_MOUSE_EVENT > - } else if (!isMouseGrabed) { > + } else if (!isMouseGrabbed) { > if (p.x > -1 && p.x < screen.width && p.y > -1 && p.y < screen.height) { > [self grabMouse]; > } else { > @@ -666,7 +666,7 @@ QemuCocoaView *cocoaView; > COCOA_MOUSE_EVENT > break; > case NSScrollWheel: > - if (isTabletEnabled || isMouseGrabed) { > + if (isTabletEnabled || isMouseGrabbed) { > kbd_mouse_event(0, 0, -[event deltaY], 0); > } else { > [NSApp sendEvent:event]; > @@ -689,7 +689,7 @@ QemuCocoaView *cocoaView; > } > [NSCursor hide]; > CGAssociateMouseAndMouseCursorPosition(FALSE); > - isMouseGrabed = TRUE; // while isMouseGrabed = TRUE, QemuCocoaApp sends all events to [cocoaView handleEvent:] > + isMouseGrabbed = TRUE; // while isMouseGrabbed = TRUE, QemuCocoaApp sends all events to [cocoaView handleEvent:] > } > > - (void) ungrabMouse > @@ -704,11 +704,11 @@ QemuCocoaView *cocoaView; > } > [NSCursor unhide]; > CGAssociateMouseAndMouseCursorPosition(TRUE); > - isMouseGrabed = FALSE; > + isMouseGrabbed = FALSE; > } > > - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled {isAbsoluteEnabled = tIsAbsoluteEnabled;} > -- (BOOL) isMouseGrabed {return isMouseGrabed;} > +- (BOOL) isMouseGrabbed {return isMouseGrabbed;} > - (BOOL) isAbsoluteEnabled {return isAbsoluteEnabled;} > - (float) cdx {return cdx;} > - (float) cdy {return cdy;} > @@ -779,7 +779,7 @@ QemuCocoaView *cocoaView; > { > COCOA_DEBUG("QemuCocoaAppController: applicationDidFinishLaunching\n"); > > - // Display an open dialog box if no argument were passed or > + // Display an open dialog box if no arguments were passed or > // if qemu was launched from the finder ( the Finder passes "-psn" ) > if( gArgc <= 1 || strncmp ((char *)gArgv[1], "-psn", 4) == 0) { > NSOpenPanel *op = [[NSOpenPanel alloc] init]; > @@ -1011,7 +1011,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl) > > if (kbd_mouse_is_absolute()) { > if (![cocoaView isAbsoluteEnabled]) { > - if ([cocoaView isMouseGrabed]) { > + if ([cocoaView isMouseGrabbed]) { > [cocoaView ungrabMouse]; > } > } Reviewed-by: Stefan Weil PS. Does anybody know how to add the QEMU mascot as a Cocoa application icon for all QEMU applications?