Patchwork console: unbreak cocoa

login
register
mail settings
Submitter Gerd Hoffmann
Date April 18, 2013, 6:20 a.m.
Message ID <1366266023-28322-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/237438/
State New
Headers show

Comments

Gerd Hoffmann - April 18, 2013, 6:20 a.m.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/cocoa.m |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Peter Maydell - April 18, 2013, 6:33 a.m.
On 18 April 2013 07:20, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  ui/cocoa.m |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 048cc97..14b784d 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -495,7 +495,7 @@ QemuCocoaView *cocoaView;
>                  if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup
>                      kbd_put_keycode(keycode);
>                      kbd_put_keycode(keycode | 0x80);
> -                } else if (is_graphic_console()) {
> +                } else if (qemu_console_is_graphic(NULL)) {

This isn't the only use of is_graphic_console(); compare
the patch I sent last night:

http://patchwork.ozlabs.org/patch/237347/

thanks
-- PMM
Gerd Hoffmann - April 18, 2013, 6:47 a.m.
Hi,

>> -                } else if (is_graphic_console()) {
>> +                } else if (qemu_console_is_graphic(NULL)) {
> 
> This isn't the only use of is_graphic_console(); compare
> the patch I sent last night:
> 
> http://patchwork.ozlabs.org/patch/237347/

Yea, just found it in my inbox.

thanks,
  Gerd

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 048cc97..14b784d 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -495,7 +495,7 @@  QemuCocoaView *cocoaView;
                 if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup
                     kbd_put_keycode(keycode);
                     kbd_put_keycode(keycode | 0x80);
-                } else if (is_graphic_console()) {
+                } else if (qemu_console_is_graphic(NULL)) {
                     if (keycode & 0x80)
                         kbd_put_keycode(0xe0);
                     if (modifiers_state[keycode] == 0) { // keydown
@@ -1006,7 +1006,7 @@  static void cocoa_refresh(DisplayChangeListener *dcl)
             [cocoaView handleEvent:event];
         }
     } while(event != nil);
-    vga_hw_update();
+    graphic_hw_update(NULL);
 }
 
 static void cocoa_cleanup(void)