NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

VirtualGraphics: Cache locally keymap

Browse Source
This commit is contained in:
Cole Robinson 2013-04-13 16:14:14 -04:00
parent 02733ecff4
commit 94cf9a204b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
virtinst/VirtualGraphics.py
View File

@ -112,6 +112,7 @@ class VirtualGraphics(VirtualDevice):
self._display = None self._display = None
self._socket = None self._socket = None
self._channels = {} self._channels = {}
self._local_keymap = -1
if self._is_parse(): if self._is_parse():
return return
@ -127,13 +128,15 @@ class VirtualGraphics(VirtualDevice):
self.channels = channels self.channels = channels
def _default_keymap(self): def _default_keymap(self, force_local=False):
if (self.conn and if (not force_local and self.conn and
support.check_conn_support(self.conn, support.check_conn_support(self.conn,
support.SUPPORT_CONN_KEYMAP_AUTODETECT)): support.SUPPORT_CONN_KEYMAP_AUTODETECT)):
return None return None
return util.default_keymap() if self._local_keymap == -1:
self._local_keymap = util.default_keymap()
return self._local_keymap
def get_type(self): def get_type(self):
return self._type return self._type
@ -163,7 +166,7 @@ class VirtualGraphics(VirtualDevice):
if self._keymap == self.KEYMAP_DEFAULT: if self._keymap == self.KEYMAP_DEFAULT:
return self._default_keymap() return self._default_keymap()
if self._keymap == self.KEYMAP_LOCAL: if self._keymap == self.KEYMAP_LOCAL:
return util.default_keymap() return self._default_keymap(force_local=True)
return self._keymap return self._keymap
def set_keymap(self, val): def set_keymap(self, val):
# At this point, 'None' is a valid value # At this point, 'None' is a valid value
@ -178,7 +181,7 @@ class VirtualGraphics(VirtualDevice):
if type(val) is not str: if type(val) is not str:
raise ValueError(_("Keymap must be a string")) raise ValueError(_("Keymap must be a string"))
if val.lower() == self.KEYMAP_LOCAL: if val.lower() == self.KEYMAP_LOCAL:
val = util.default_keymap() val = self._default_keymap(force_local=True)
elif len(val) > 16: elif len(val) > 16:
raise ValueError(_("Keymap must be less than 16 characters")) raise ValueError(_("Keymap must be less than 16 characters"))
elif re.match("^[a-zA-Z0-9_-]*$", val) is None: elif re.match("^[a-zA-Z0-9_-]*$", val) is None: