mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
virtManager/ui: add opengl graphics option
Add an OpenGL checkbox to the Spice graphics options (only available if SUPPORT_CONN_SPICE_GL). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
parent
ecd66a7df2
commit
88942028b3
@ -363,5 +363,35 @@
|
|||||||
<property name="top_attach">0</property>
|
<property name="top_attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label3">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Open_GL:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
<property name="mnemonic_widget">graphics-opengl</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">8</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCheckButton" id="graphics-opengl">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">False</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
<signal name="toggled" handler="on_graphics_opengl_toggled" swapped="no"/>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">8</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</interface>
|
</interface>
|
||||||
|
@ -1555,7 +1555,7 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
def _validate_page_graphics(self):
|
def _validate_page_graphics(self):
|
||||||
try:
|
try:
|
||||||
(gtype, port,
|
(gtype, port,
|
||||||
tlsport, addr, passwd, keymap) = self._gfxdetails.get_values()
|
tlsport, addr, passwd, keymap, gl) = self._gfxdetails.get_values()
|
||||||
|
|
||||||
self._dev = virtinst.VirtualGraphics(self.conn.get_backend())
|
self._dev = virtinst.VirtualGraphics(self.conn.get_backend())
|
||||||
self._dev.type = gtype
|
self._dev.type = gtype
|
||||||
@ -1563,6 +1563,7 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
self._dev.passwd = passwd
|
self._dev.passwd = passwd
|
||||||
self._dev.listen = addr
|
self._dev.listen = addr
|
||||||
self._dev.tlsPort = tlsport
|
self._dev.tlsPort = tlsport
|
||||||
|
self._dev.gl = gl
|
||||||
if keymap:
|
if keymap:
|
||||||
self._dev.keymap = keymap
|
self._dev.keymap = keymap
|
||||||
except ValueError, e:
|
except ValueError, e:
|
||||||
|
@ -90,6 +90,7 @@ EDIT_GFX_KEYMAP,
|
|||||||
EDIT_GFX_ADDRESS,
|
EDIT_GFX_ADDRESS,
|
||||||
EDIT_GFX_TLSPORT,
|
EDIT_GFX_TLSPORT,
|
||||||
EDIT_GFX_PORT,
|
EDIT_GFX_PORT,
|
||||||
|
EDIT_GFX_OPENGL,
|
||||||
|
|
||||||
EDIT_VIDEO_MODEL,
|
EDIT_VIDEO_MODEL,
|
||||||
|
|
||||||
@ -104,7 +105,7 @@ EDIT_FS,
|
|||||||
|
|
||||||
EDIT_HOSTDEV_ROMBAR,
|
EDIT_HOSTDEV_ROMBAR,
|
||||||
|
|
||||||
) = range(1, 45)
|
) = range(1, 46)
|
||||||
|
|
||||||
|
|
||||||
# Columns in hw list model
|
# Columns in hw list model
|
||||||
@ -394,6 +395,8 @@ class vmmDetails(vmmGObjectUI):
|
|||||||
lambda *x: self.enable_apply(x, EDIT_GFX_TYPE))
|
lambda *x: self.enable_apply(x, EDIT_GFX_TYPE))
|
||||||
self.gfxdetails.connect("changed-port",
|
self.gfxdetails.connect("changed-port",
|
||||||
lambda *x: self.enable_apply(x, EDIT_GFX_PORT))
|
lambda *x: self.enable_apply(x, EDIT_GFX_PORT))
|
||||||
|
self.gfxdetails.connect("changed-opengl",
|
||||||
|
lambda *x: self.enable_apply(x, EDIT_GFX_OPENGL))
|
||||||
self.gfxdetails.connect("changed-tlsport",
|
self.gfxdetails.connect("changed-tlsport",
|
||||||
lambda *x: self.enable_apply(x, EDIT_GFX_TLSPORT))
|
lambda *x: self.enable_apply(x, EDIT_GFX_TLSPORT))
|
||||||
self.gfxdetails.connect("changed-address",
|
self.gfxdetails.connect("changed-address",
|
||||||
@ -2158,7 +2161,7 @@ class vmmDetails(vmmGObjectUI):
|
|||||||
|
|
||||||
def config_graphics_apply(self, devobj):
|
def config_graphics_apply(self, devobj):
|
||||||
(gtype, port,
|
(gtype, port,
|
||||||
tlsport, addr, passwd, keymap) = self.gfxdetails.get_values()
|
tlsport, addr, passwd, keymap, gl) = self.gfxdetails.get_values()
|
||||||
|
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
|
|
||||||
@ -2170,6 +2173,8 @@ class vmmDetails(vmmGObjectUI):
|
|||||||
kwargs["keymap"] = keymap
|
kwargs["keymap"] = keymap
|
||||||
if self.edited(EDIT_GFX_PORT):
|
if self.edited(EDIT_GFX_PORT):
|
||||||
kwargs["port"] = port
|
kwargs["port"] = port
|
||||||
|
if self.edited(EDIT_GFX_OPENGL):
|
||||||
|
kwargs["gl"] = gl
|
||||||
if self.edited(EDIT_GFX_TLSPORT):
|
if self.edited(EDIT_GFX_TLSPORT):
|
||||||
kwargs["tlsport"] = tlsport
|
kwargs["tlsport"] = tlsport
|
||||||
if self.edited(EDIT_GFX_TYPE):
|
if self.edited(EDIT_GFX_TYPE):
|
||||||
|
@ -825,7 +825,8 @@ class vmmDomain(vmmLibvirtObject):
|
|||||||
|
|
||||||
def define_graphics(self, devobj, do_hotplug,
|
def define_graphics(self, devobj, do_hotplug,
|
||||||
listen=_SENTINEL, port=_SENTINEL, tlsport=_SENTINEL,
|
listen=_SENTINEL, port=_SENTINEL, tlsport=_SENTINEL,
|
||||||
passwd=_SENTINEL, keymap=_SENTINEL, gtype=_SENTINEL):
|
passwd=_SENTINEL, keymap=_SENTINEL, gtype=_SENTINEL,
|
||||||
|
gl=_SENTINEL):
|
||||||
xmlobj = self._make_xmlobj_to_define()
|
xmlobj = self._make_xmlobj_to_define()
|
||||||
editdev = self._lookup_device_to_define(xmlobj, devobj, do_hotplug)
|
editdev = self._lookup_device_to_define(xmlobj, devobj, do_hotplug)
|
||||||
if not editdev:
|
if not editdev:
|
||||||
@ -843,6 +844,8 @@ class vmmDomain(vmmLibvirtObject):
|
|||||||
editdev.keymap = keymap
|
editdev.keymap = keymap
|
||||||
if gtype != _SENTINEL:
|
if gtype != _SENTINEL:
|
||||||
editdev.type = gtype
|
editdev.type = gtype
|
||||||
|
if gl != _SENTINEL:
|
||||||
|
editdev.gl = gl
|
||||||
|
|
||||||
if do_hotplug:
|
if do_hotplug:
|
||||||
self.hotplug(device=editdev)
|
self.hotplug(device=editdev)
|
||||||
|
@ -35,6 +35,7 @@ class vmmGraphicsDetails(vmmGObjectUI):
|
|||||||
"changed-type": (GObject.SignalFlags.RUN_FIRST, None, []),
|
"changed-type": (GObject.SignalFlags.RUN_FIRST, None, []),
|
||||||
"changed-address": (GObject.SignalFlags.RUN_FIRST, None, []),
|
"changed-address": (GObject.SignalFlags.RUN_FIRST, None, []),
|
||||||
"changed-keymap": (GObject.SignalFlags.RUN_FIRST, None, []),
|
"changed-keymap": (GObject.SignalFlags.RUN_FIRST, None, []),
|
||||||
|
"changed-opengl": (GObject.SignalFlags.RUN_FIRST, None, []),
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, vm, builder, topwin):
|
def __init__(self, vm, builder, topwin):
|
||||||
@ -54,6 +55,7 @@ class vmmGraphicsDetails(vmmGObjectUI):
|
|||||||
"on_graphics_tlsport_changed": lambda ignore: self.emit("changed-tlsport"),
|
"on_graphics_tlsport_changed": lambda ignore: self.emit("changed-tlsport"),
|
||||||
"on_graphics_port_changed": lambda ignore: self.emit("changed-port"),
|
"on_graphics_port_changed": lambda ignore: self.emit("changed-port"),
|
||||||
"on_graphics_keymap_changed": lambda ignore: self.emit("changed-keymap"),
|
"on_graphics_keymap_changed": lambda ignore: self.emit("changed-keymap"),
|
||||||
|
"on_graphics_opengl_toggled": lambda ignore: self.emit("changed-opengl"),
|
||||||
})
|
})
|
||||||
|
|
||||||
self._init_ui()
|
self._init_ui()
|
||||||
@ -143,7 +145,9 @@ class vmmGraphicsDetails(vmmGObjectUI):
|
|||||||
if not self.widget("graphics-password-chk").get_active():
|
if not self.widget("graphics-password-chk").get_active():
|
||||||
passwd = None
|
passwd = None
|
||||||
|
|
||||||
return gtype, port, tlsport, addr, passwd, keymap
|
gl = self.widget("graphics-opengl").get_active()
|
||||||
|
|
||||||
|
return gtype, port, tlsport, addr, passwd, keymap, gl
|
||||||
|
|
||||||
def set_dev(self, gfx):
|
def set_dev(self, gfx):
|
||||||
self.reset_state()
|
self.reset_state()
|
||||||
@ -188,6 +192,7 @@ class vmmGraphicsDetails(vmmGObjectUI):
|
|||||||
|
|
||||||
if is_spice:
|
if is_spice:
|
||||||
set_port("graphics-tlsport", gfx.tlsPort)
|
set_port("graphics-tlsport", gfx.tlsPort)
|
||||||
|
self.widget("graphics-opengl").set_active(gfx.gl or False)
|
||||||
|
|
||||||
if is_sdl:
|
if is_sdl:
|
||||||
title = _("Local SDL Window")
|
title = _("Local SDL Window")
|
||||||
@ -208,13 +213,15 @@ class vmmGraphicsDetails(vmmGObjectUI):
|
|||||||
def _show_rows_from_type(self):
|
def _show_rows_from_type(self):
|
||||||
hide_all = ["graphics-xauth", "graphics-display", "graphics-address",
|
hide_all = ["graphics-xauth", "graphics-display", "graphics-address",
|
||||||
"graphics-password-box", "graphics-keymap", "graphics-port-box",
|
"graphics-password-box", "graphics-keymap", "graphics-port-box",
|
||||||
"graphics-tlsport-box"]
|
"graphics-tlsport-box", "graphics-opengl"]
|
||||||
|
|
||||||
gtype = uiutil.get_list_selection(self.widget("graphics-type"))
|
gtype = uiutil.get_list_selection(self.widget("graphics-type"))
|
||||||
sdl_rows = ["graphics-xauth", "graphics-display"]
|
sdl_rows = ["graphics-xauth", "graphics-display"]
|
||||||
vnc_rows = ["graphics-password-box", "graphics-address",
|
vnc_rows = ["graphics-password-box", "graphics-address",
|
||||||
"graphics-port-box", "graphics-keymap"]
|
"graphics-port-box", "graphics-keymap"]
|
||||||
spice_rows = vnc_rows[:] + ["graphics-tlsport-box"]
|
spice_rows = vnc_rows[:] + ["graphics-tlsport-box"]
|
||||||
|
if self.conn.check_support(self.conn.SUPPORT_CONN_SPICE_GL):
|
||||||
|
spice_rows.extend(["graphics-opengl"])
|
||||||
|
|
||||||
rows = []
|
rows = []
|
||||||
if gtype == "sdl":
|
if gtype == "sdl":
|
||||||
|
Loading…
Reference in New Issue
Block a user