- quit on vm exit by default.

- wind up eject.

1 files changed, 13 insertions, 4 deletions

diff --git a/qemu-gtk.c b/qemu-gtk.c
index b5a03ee..1d99f90 100644
--- a/qemu-gtk.c
+++ b/qemu-gtk.c
@@ -437,7 +437,10 @@ static const GtkActionEntry entries[] = {
     },{
 
         /* --- sub menus --- */
-	.name        = "MediaChangeSubMenu",
+	.name        = "EjectMediaSubMenu",
+	.label       = "_Eject media",
+    },{
+	.name        = "ChangeMediaSubMenu",
 	.label       = "_Change media",
     },{
 
@@ -535,8 +538,8 @@ static char ui_xml[] =
 "      <menuitem action='RunGdb'/>"
 "    </menu>"
 "    <menu action='DevicesMenu'>"
-"      <menu action='MediaChangeSubMenu'>"
-"      </menu>"
+"      <menu action='EjectMediaSubMenu'/>"
+"      <menu action='ChangeMediaSubMenu'/>"
 "    </menu>"
 "    <menu action='HelpMenu'>"
 "      <menuitem action='About'/>"
@@ -666,6 +669,7 @@ static void usage(FILE *fp)
 	    "options:\n"
 	    "   -h          Print this text.\n"
 	    "   -d          Raise debug level.\n"
+	    "   -k          Keep window open on VM shutdown.\n"
 	    "   -m          Enable monitor logging and access.\n"
 	    "   -c <dev>    Show serial console.\n"
 	    "\n"
@@ -680,16 +684,20 @@ main(int argc, char *argv[])
     struct qemu_window *win;
     char *console_tab = NULL;
     int monitor_tab = 0;
+    int quit_on_shutdown = 1;
     int c;
 
     gtk_init(&argc, &argv);
     for (;;) {
-        if (-1 == (c = getopt(argc, argv, "hdmc:")))
+        if (-1 == (c = getopt(argc, argv, "hdkmc:")))
             break;
         switch (c) {
 	case 'd':
 	    debug++;
 	    break;
+	case 'k':
+            quit_on_shutdown = 0;
+	    break;
         case 'm':
             monitor_tab++;
             break;
@@ -715,6 +723,7 @@ main(int argc, char *argv[])
     if (-1 == monitor_connect(win, argv[optind])) {
         exit(1);
     }
+    win->quit_on_shutdown = quit_on_shutdown;
 
     /* tabs */
     if (monitor_tab)