Skip to contentSkip to conversation

ui/gtk: detach_all option for making all VCs detached upon starting

PATCH Superseded Dongwon Kim 3 participants 6 messages Jul 19, 2021 – Jul 26, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ui/gtk: detach_all option for making all VCs detached upon starting

With "detach-all=on" for display, all VCs are detached from the beginning. This is useful when there are multiple displays assigned to a guest OS.

---
 qapi/ui.json | 4 +++-
 ui/gtk.c     | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
qapi/ui.json +3 -1
index 1052ca9c38..ff14bb2f46 100644
@@ -1141,6 +1141,7 @@
 # @show-cursor:   Force showing the mouse cursor (default: off).
 #                 (since: 5.0)
 # @gl:            Enable OpenGL support (default: off).
+# @detach-all:    Detatch all VirtualConsoles from beginning (default: off).
 #
 # Since: 2.12
 #
@@ -1150,7 +1151,8 @@
                 '*full-screen'   : 'bool',
                 '*window-close'  : 'bool',
                 '*show-cursor'   : 'bool',
-                '*gl'            : 'DisplayGLMode' },
+                '*gl'            : 'DisplayGLMode',
+                '*detach-all'    : 'bool' },
   'discriminator' : 'type',
   'data'    : { 'gtk'            : 'DisplayGTK',
                 'curses'         : 'DisplayCurses',
ui/gtk.c +7 -0
index ce885d2ca3..a07e5a049e 100644
@@ -2211,6 +2211,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     GdkDisplay *window_display;
     GtkIconTheme *theme;
     char *dir;
+    int i;
 
     if (!gtkinit) {
         fprintf(stderr, "gtk initialization failed\n");
@@ -2290,6 +2291,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
         gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
     }
     gd_clipboard_init(s);
+
+    if (opts->detach_all) {
+        for (i = 0; i < s->nb_vcs - 1; i++) {
+            gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
+        }
+    }
 }
 
 static void early_gtk_display_init(DisplayOptions *opts)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 ui/gtk: specify detached window's size and location

Specify location and size of detached window based on top level window's location and size info when detachment happens.

---
 ui/gtk.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
ui/gtk.c +14 -0
index a07e5a049e..9b4e85624a 100644
@@ -1274,6 +1274,8 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque)
 {
     GtkDisplayState *s = opaque;
     VirtualConsole *vc = gd_vc_find_current(s);
+    gint x, y, w, h;
+    int i;
 
     if (vc->type == GD_VC_GFX &&
         qemu_console_is_graphic(vc->gfx.dcl.con)) {
@@ -1284,6 +1286,18 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque)
         gtk_widget_set_sensitive(vc->menu_item, false);
         vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         gd_widget_reparent(s->notebook, vc->window, vc->tab_item);
+        gtk_window_get_position(GTK_WINDOW(s->window), &x, &y);
+        gtk_window_get_size(GTK_WINDOW(s->window), &w, &h);
+
+        for (i = 0; i < s->nb_vcs; i++) {
+            if (vc == &s->vc[i]) {
+                break;
+            }
+        }
+
+        gtk_window_move(GTK_WINDOW(vc->window),
+                        x + w * (i % (s->nb_vcs/2) + 1), y + h * (i / (s->nb_vcs/2)));
+        gtk_window_resize(GTK_WINDOW(vc->window), w, h);
 
         g_signal_connect(vc->window, "delete-event",
                          G_CALLBACK(gd_tab_window_close), vc);
Signature · 1 line
2.17.1
#2 lore raw
In reply to Dongwon Kim
Quoted 2 lines · Dongwon Kim

With "detach-all=on" for display, all VCs are detached from the beginning. This is useful when there are multiple displays assigned to a guest OS.

Can you elaborate? (i.e. why is it useful? Do you just want to avoid having multiple things opened at startup? Or is there a different reason?)

Quoted 12 lines
---
  qapi/ui.json | 4 +++-
  ui/gtk.c     | 7 +++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
qapi/ui.json +0 -0
index 1052ca9c38..ff14bb2f46 100644

qapi/ui.json line 1144

Quoted 4 lines
qapi/ui.json +1 -0
@@ -1141,6 +1141,7 @@
  # @show-cursor:   Force showing the mouse cursor (default: off).
  #                 (since: 5.0)
  # @gl:            Enable OpenGL support (default: off).
+# @detach-all:    Detatch all VirtualConsoles from beginning (default: off).

Needs a comment à la "(since: 6.2)" at the end (like the one after "show-cursor" some lines earlier.

qapi/ui.json line 1155

Quoted 10 lines
qapi/ui.json +2 -1
  #
  # Since: 2.12
  #
@@ -1150,7 +1151,8 @@
                  '*full-screen'   : 'bool',
                  '*window-close'  : 'bool',
                  '*show-cursor'   : 'bool',
-                '*gl'            : 'DisplayGLMode' },
+                '*gl'            : 'DisplayGLMode',
+                '*detach-all'    : 'bool' },

If this is for GTK only, shouldn't this rather go into DisplayGTK instead? Or will this be also useful for other display types later?

Thomas

Quoted 29 lines
qapi/ui.json +0 -0
    'discriminator' : 'type',
    'data'    : { 'gtk'            : 'DisplayGTK',
                  'curses'         : 'DisplayCurses',
ui/gtk.c +7 -0
index ce885d2ca3..a07e5a049e 100644
@@ -2211,6 +2211,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
      GdkDisplay *window_display;
      GtkIconTheme *theme;
      char *dir;
+    int i;
 
      if (!gtkinit) {
          fprintf(stderr, "gtk initialization failed\n");
@@ -2290,6 +2291,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
          gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
      }
      gd_clipboard_init(s);
+
+    if (opts->detach_all) {
+        for (i = 0; i < s->nb_vcs - 1; i++) {
+            gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
+        }
+    }
  }
 
  static void early_gtk_display_init(DisplayOptions *opts)
#3 lore raw
Quoted 6 lines · Thomas Huth
Quoted 2 lines · Dongwon Kim

With "detach-all=on" for display, all VCs are detached from the beginning. This is useful when there are multiple displays assigned to a guest OS.

Can you elaborate? (i.e. why is it useful? Do you just want to avoid having multiple things opened at startup? Or is there a different reason?)

Hi,

The original motivation is related to an use-case with a guest with multi-displays. In that use case, we wanted to have all guest displays placed side by side from beginning. Virtual consoles other than guest displays (e.g. virtio-gpu-pci) are not actually needed but I found doing "detach-all" is the simplest way.

Quoted 21 lines
Quoted 13 lines
---
  qapi/ui.json | 4 +++-
  ui/gtk.c     | 7 +++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
qapi/ui.json +0 -0
index 1052ca9c38..ff14bb2f46 100644

qapi/ui.json line 1144

Quoted 4 lines
qapi/ui.json +1 -0
@@ -1141,6 +1141,7 @@
  # @show-cursor:   Force showing the mouse cursor (default: off).
  #                 (since: 5.0)
  # @gl:            Enable OpenGL support (default: off).
+# @detach-all:    Detatch all VirtualConsoles from beginning (default: off).

Needs a comment à la "(since: 6.2)" at the end (like the one after "show-cursor" some lines earlier.

Quoted 13 lines

qapi/ui.json line 1155

Quoted 10 lines
qapi/ui.json +2 -1
  #
  # Since: 2.12
  #
@@ -1150,7 +1151,8 @@
                  '*full-screen'   : 'bool',
                  '*window-close'  : 'bool',
                  '*show-cursor'   : 'bool',
-                '*gl'            : 'DisplayGLMode' },
+                '*gl'            : 'DisplayGLMode',
+                '*detach-all'    : 'bool' },

If this is for GTK only, shouldn't this rather go into DisplayGTK instead? Or will this be also useful for other display types later?

This option might not be that useful for other use cases.. but at the same time, I'm pretty sure this will work universally (won't break anything..) but for now, I think it's good idea to limit this to GTK.

-DW

Quoted 32 lines

Thomas

Quoted 27 lines
qapi/ui.json +0 -0
    'discriminator' : 'type',
    'data'    : { 'gtk'            : 'DisplayGTK',
                  'curses'         : 'DisplayCurses',
ui/gtk.c +7 -0
index ce885d2ca3..a07e5a049e 100644
@@ -2211,6 +2211,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
      GdkDisplay *window_display;
      GtkIconTheme *theme;
      char *dir;
+    int i;
      if (!gtkinit) {
          fprintf(stderr, "gtk initialization failed\n");
@@ -2290,6 +2291,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
          gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
      }
      gd_clipboard_init(s);
+
+    if (opts->detach_all) {
+        for (i = 0; i < s->nb_vcs - 1; i++) {
+            gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
+        }
+    }
  }
  static void early_gtk_display_init(DisplayOptions *opts)
 
#4 lore raw

I've tried and this patch is able to detach all the virtual console after we launch the qemu. However, I think we need to filter out other terminal that are not related to view such as compatmonitor(), serial and parallel.

Also, I think we can have the detach specific to virtio-pci view without the need to have new parameters.

Quoted 81 lines

-----Original Message-----
From: Kim, Dongwon <[email protected]>
Sent: Wednesday, July 21, 2021 6:17 AM
To: Thomas Huth <[email protected]>
Cc: [email protected]; Romli, Khairul Anuar <[email protected]>
Subject: Re: [PATCH 1/2] ui/gtk: detach_all option for making all VCs detached upon starting

Quoted 2 lines · Thomas Huth
Quoted 1 line · Dongwon Kim

With "detach-all=on" for display, all VCs are detached from the

beginning.

Quoted 5 lines
Quoted 1 line

This is useful when there are multiple displays assigned to a guest OS.

Can you elaborate? (i.e. why is it useful? Do you just want to avoid having multiple things opened at startup? Or is there a different reason?)

Hi,

The original motivation is related to an use-case with a guest with multi- displays. In that use case, we wanted to have all guest displays placed side by side from beginning. Virtual consoles other than guest displays (e.g. virtio- gpu-pci) are not actually needed but I found doing "detach-all" is the simplest way.

Quoted 8 lines
Quoted 8 lines
---
  qapi/ui.json | 4 +++-
  ui/gtk.c     | 7 +++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
Quoted 9 lines

qapi/ui.json line 1144

Quoted 9 lines
qapi/ui.json index renamed from qapi/ui.json +0 -0

1052ca9c38..ff14bb2f46 100644

qapi/ui.json +1 -0
@@ -1141,6 +1141,7 @@
  # @show-cursor:   Force showing the mouse cursor (default: off).
  #                 (since: 5.0)
  # @gl:            Enable OpenGL support (default: off).
+# @detach-all:    Detatch all VirtualConsoles from beginning (default:

off).

Quoted 4 lines

Needs a comment à la "(since: 6.2)" at the end (like the one after "show-cursor" some lines earlier.

Quoted 13 lines

qapi/ui.json line 1155

Quoted 10 lines
qapi/ui.json +2 -1
  #
  # Since: 2.12
  #
@@ -1150,7 +1151,8 @@
                  '*full-screen'   : 'bool',
                  '*window-close'  : 'bool',
                  '*show-cursor'   : 'bool',
-                '*gl'            : 'DisplayGLMode' },
+                '*gl'            : 'DisplayGLMode',
+                '*detach-all'    : 'bool' },

If this is for GTK only, shouldn't this rather go into DisplayGTK instead? Or will this be also useful for other display types later?

This option might not be that useful for other use cases.. but at the same time, I'm pretty sure this will work universally (won't break anything..) but for now, I think it's good idea to limit this to GTK.

-DW

Quoted 4 lines

Thomas

Quoted 8 lines

ui/gtk.c static void gtk_display_init(DisplayState *ds,

Quoted 8 lines
qapi/ui.json +0 -0
    'discriminator' : 'type',
    'data'    : { 'gtk'            : 'DisplayGTK',
                  'curses'         : 'DisplayCurses',
ui/gtk.c +0 -0
index ce885d2ca3..a07e5a049e 100644
@@ -2211,6 +2211,7 @@ static void gtk_display_init(DisplayState *ds,

DisplayOptions *opts)

Quoted 16 lines
Quoted 7 lines

ui/gtk.c static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)

Quoted 7 lines
ui/gtk.c +2 -0
      GdkDisplay *window_display;
      GtkIconTheme *theme;
      char *dir;
+    int i;
      if (!gtkinit) {
          fprintf(stderr, "gtk initialization failed\n"); @@ -2290,6
+2291,12 @@ static void gtk_display_init(DisplayState *ds,

DisplayOptions *opts)

Quoted 8 lines
Quoted 1 line

gtk_menu_item_activate(GTK_MENU_ITEM(s-

grab_on_hover_item));

Quoted 6 lines
      }
      gd_clipboard_init(s);
ui/gtk.c +3 -0
+
+    if (opts->detach_all) {
 
+        for (i = 0; i < s->nb_vcs - 1; i++) {

[Romli, Khairul Anuar] We can a conditional check here to only detech virtio-pci view rather than "everything". Also, we may want to consider not to detach the primary view and keep it remain in qemu primary window.

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
ui/gtk.c +3 -0
+            gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
+        }
+    }
  }
  static void early_gtk_display_init(DisplayOptions *opts)
#5 lore raw

PATCH v2 1/2 ui/gtk: detach_all option for making all VCs detached upon starting

In reply to Dongwon Kim

With "detach-all=on" for display, all VCs are detached from the beginning. This is useful when there are multiple displays assigned to a guest OS.

v2: Move "detach-all" option to under DisplayGTK as it's GTK specific
(Thomas Huth)

---
 qapi/ui.json | 5 ++++-
 ui/gtk.c     | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
qapi/ui.json +4 -1
index 1052ca9c38..e37af91683 100644
@@ -1035,13 +1035,16 @@
 #               assuming the guest will resize the display to match
 #               the window size then.  Otherwise it defaults to "off".
 #               Since 3.1
+# @detach-all:  Detach all VirtualConsoles when starting Qemu (default: off).
+#               Since 6.0
 #
 # Since: 2.12
 #
 ##
 { 'struct'  : 'DisplayGTK',
   'data'    : { '*grab-on-hover' : 'bool',
-                '*zoom-to-fit'   : 'bool'  } }
+                '*zoom-to-fit'   : 'bool',
+                '*detach-all'    : 'bool'  } }
 
 ##
 # @DisplayEGLHeadless:
ui/gtk.c +7 -0
index 98046f577b..48c1fff54f 100644
@@ -2189,6 +2189,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     GdkDisplay *window_display;
     GtkIconTheme *theme;
     char *dir;
+    int i;
 
     if (!gtkinit) {
         fprintf(stderr, "gtk initialization failed\n");
@@ -2268,6 +2269,12 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
         gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
     }
     gd_clipboard_init(s);
+
+    if (opts->u.gtk.detach_all) {
+        for (i = 0; i < s->nb_vcs - 1; i++) {
+            gtk_menu_item_activate(GTK_MENU_ITEM(s->untabify_item));
+        }
+    }
 }
 
 static void early_gtk_display_init(DisplayOptions *opts)
Signature · 1 line
2.17.1