Skip to content

Commit

Permalink
ui/cocoa.m: Fix recent compile breakage
Browse files Browse the repository at this point in the history
Fix failures to compile introduced by recent console commits
1dbfa00, 81c0d5a) which removed is_graphic_console() and
vga_hw_update() without updating the cocoa UI backend to match.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
  • Loading branch information
pm215 authored and blueswirl committed Apr 21, 2013
1 parent 089305a commit 68c0aa6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ui/cocoa.m
Expand Up @@ -495,7 +495,7 @@ - (void) handleEvent:(NSEvent *)event
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
Expand Down Expand Up @@ -535,7 +535,7 @@ - (void) handleEvent:(NSEvent *)event
}

// 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
Expand Down Expand Up @@ -578,7 +578,7 @@ - (void) handleEvent:(NSEvent *)event
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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 68c0aa6

Please sign in to comment.