Commit 68c0aa6e authored by Peter Maydell's avatar Peter Maydell Committed by Blue Swirl
Browse files

ui/cocoa.m: Fix recent compile breakage 



Fix failures to compile introduced by recent console commits
1dbfa005, 81c0d5a6) which removed is_graphic_console() and
vga_hw_update() without updating the cocoa UI backend to match.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 089305ac

ui/cocoa.m

+4 −4
Original line number Diff line number Diff line
@@ -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
@@ -535,7 +535,7 @@ QemuCocoaView *cocoaView; 
                }



            // handle keys for graphic console

            } else if (is_graphic_console()) {

            } else if (qemu_console_is_graphic(NULL)) {

                if (keycode & 0x80) //check bit for e0 in front

                    kbd_put_keycode(0xe0);

                kbd_put_keycode(keycode & 0x7f); //remove e0 bit in front
@@ -578,7 +578,7 @@ QemuCocoaView *cocoaView; 
            break;

        case NSKeyUp:

            keycode = cocoa_keycode_to_qemu([event keyCode]);

            if (is_graphic_console()) {

            if (qemu_console_is_graphic(NULL)) {

                if (keycode & 0x80)

                    kbd_put_keycode(0xe0);

                kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key
@@ -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)