* [Qemu-devel] [PATCH v3] ui/cocoa.m: Adds console items to the View menu
[not found] <mailman.390.1423904003.31050.qemu-devel@nongnu.org>
@ 2015-02-14 15:50 ` Programmingkid
2015-05-10 19:27 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Programmingkid @ 2015-02-14 15:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 6242 bytes --]
Adds these items to the View menu:
VGA
Monitor
Serial
Parallel
Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
---
Removed commented out code.
include/ui/console.h | 1 +
ui/cocoa.m | 60 ++++++++++++++++++++++++++++++++++++++++++++-----
ui/console.c | 38 +++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 8a4d671..efe5517 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -323,6 +323,7 @@ void qemu_console_copy(QemuConsole *con, int src_x, int src_y,
int dst_x, int dst_y, int w, int h);
DisplaySurface *qemu_console_surface(QemuConsole *con);
DisplayState *qemu_console_displaystate(QemuConsole *console);
+int get_console_index(const char *name);
/* sdl.c */
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
diff --git a/ui/cocoa.m b/ui/cocoa.m
index d37c29b..14f0503 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -801,6 +801,10 @@ QemuCocoaView *cocoaView;
- (void)toggleFullScreen:(id)sender;
- (void)showQEMUDoc:(id)sender;
- (void)showQEMUTec:(id)sender;
+- (void)displayVGA:(id)sender;
+- (void)displayMonitor:(id)sender;
+- (void)displayParallel:(id)sender;
+- (void)displaySerial:(id)sender;
@end
@implementation QemuCocoaAppController
@@ -943,6 +947,31 @@ QemuCocoaView *cocoaView;
[[NSWorkspace sharedWorkspace] openFile:[NSString stringWithFormat:@"%@/../doc/qemu/qemu-tech.html",
[[NSBundle mainBundle] resourcePath]] withApplication:@"Help Viewer"];
}
+
+/* Displays the VGA screen */
+- (void)displayVGA:(id)sender
+{
+ console_select(get_console_index("graphic"));
+}
+
+/* Displays the QEMU Monitor screen */
+- (void)displayMonitor:(id)sender
+{
+ console_select(get_console_index("monitor"));
+}
+
+/* Displays the serial port screen */
+- (void)displaySerial:(id)sender
+{
+ console_select(get_console_index("serial"));
+}
+
+/* Displays the parallel port screen */
+- (void)displayParallel:(id)sender
+{
+ console_select(get_console_index("parallel"));
+}
+
@end
@@ -1003,13 +1032,6 @@ int main (int argc, const char * argv[]) {
[[NSApp mainMenu] addItem:menuItem];
[NSApp performSelector:@selector(setAppleMenu:) withObject:menu]; // Workaround (this method is private since 10.4+)
- // View menu
- menu = [[NSMenu alloc] initWithTitle:@"View"];
- [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Enter Fullscreen" action:@selector(toggleFullScreen:) keyEquivalent:@"f"] autorelease]]; // Fullscreen
- menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease];
- [menuItem setSubmenu:menu];
- [[NSApp mainMenu] addItem:menuItem];
-
// Window menu
menu = [[NSMenu alloc] initWithTitle:@"Window"];
[menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"] autorelease]]; // Miniaturize
@@ -1116,6 +1138,27 @@ static const DisplayChangeListenerOps dcl_ops = {
.dpy_refresh = cocoa_refresh,
};
+// Creates the view menu
+static void create_view_menu()
+{
+ NSMenu * menu;
+ NSMenuItem * menuItem;
+ menu = [[NSMenu alloc] initWithTitle:@"View"];
+ [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Enter Fullscreen" action:@selector(toggleFullScreen:) keyEquivalent:@"f"] autorelease]]; // Fullscreen
+ [menu addItem:[NSMenuItem separatorItem]]; //Separator
+ if(get_console_index("graphic") != -1)
+ [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"VGA" action:@selector(displayVGA:) keyEquivalent:@""] autorelease]]; // VGA
+ if(get_console_index("monitor") != -1)
+ [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"QEMU Monitor" action:@selector(displayMonitor:) keyEquivalent:@""] autorelease]]; // QEMU Monitor
+ if (get_console_index("serial") != -1)
+ [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Serial" action:@selector(displaySerial:) keyEquivalent:@""] autorelease]]; // Serial
+ if(get_console_index("parallel") != -1)
+ [menu addItem: [[[NSMenuItem alloc] initWithTitle:@"Parallel" action:@selector(displayParallel:) keyEquivalent:@""] autorelease]]; // Parallel
+ menuItem = [[[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""] autorelease];
+ [menuItem setSubmenu:menu];
+ [[NSApp mainMenu] insertItem: menuItem atIndex: 1]; // insert View menu after Application menu
+}
+
void cocoa_display_init(DisplayState *ds, int full_screen)
{
COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n");
@@ -1128,4 +1171,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen)
// register cleanup function
atexit(cocoa_cleanup);
+
+ // called here because QEMU needs to be running first
+ create_view_menu();
}
diff --git a/ui/console.c b/ui/console.c
index 87574a7..620a029 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2071,3 +2071,41 @@ static void register_types(void)
}
type_init(register_types);
+
+/*
+ Returns the console index associated with the name.
+ name can be graphic, monitor, serial, or parallel.
+*/
+int get_console_index(const char *name)
+{
+ int i;
+ /* If looking for the graphic console */
+ if (strcmp("graphic", name) == 0) {
+ for (i = 0; i < nb_consoles; i++) {
+ /* If we found the console */
+ if (consoles[i]->console_type == GRAPHIC_CONSOLE) {
+ return i;
+ }
+ }
+ /* If we failed to find the console */
+ return -1;
+ }
+
+ /* If looking for QEMU monitor, serial, or parallel console */
+ CharDriverState *chr;
+ for (i = 0; i < nb_consoles; i++) {
+ chr = consoles[i]->chr;
+
+ /* Can't do anything but skip it */
+ if (chr == NULL) {
+ continue;
+ }
+ /* If we found the console */
+ if (strstr(chr->label, name)) {
+ return i;
+ }
+ }
+
+ /* Could not find console */
+ return -1;
+}
--
1.7.5.4
[-- Attachment #2: Type: text/html, Size: 9832 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread