aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2017-08-10 11:17:12 +0100
committerDaniel P. Berrange <berrange@redhat.com>2017-08-10 11:17:12 +0100
commitaed87bb2aa6ed83b49574eb982e3bdd4c36acf17 (patch)
treed6869e31bfbc6787856b1eafdb3e544e1080608e
parentf5cc81c7933cf3d613c5cbef7679ef0f17b74723 (diff)
downloadkeycodemapdb-aed87bb2aa6ed83b49574eb982e3bdd4c36acf17.zip
keycodemapdb-aed87bb2aa6ed83b49574eb982e3bdd4c36acf17.tar.gz
keycodemapdb-aed87bb2aa6ed83b49574eb982e3bdd4c36acf17.tar.bz2
Rename 'rfb' to 'qnum'
The 'rfb' keymap is not actually defined by the RFB protocol. It is the QEMU key number mapping, that happens to be used by a QEMU RFB extension. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rwxr-xr-xtools/keymap-gen16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/keymap-gen b/tools/keymap-gen
index 719ba52..58c819c 100755
--- a/tools/keymap-gen
+++ b/tools/keymap-gen
@@ -70,8 +70,8 @@ class Database:
# Xorg + Cygwin: xwinxt + an offset
MAP_XORGXWIN = "xorgxwin"
- # XT over RFB: xtkbd + special re-encoding of high bit
- MAP_RFB = "rfb"
+ # QEMU key numbers: xtkbd + special re-encoding of high bit
+ MAP_QNUM = "qnum"
# HTML codes
MAP_HTML = "html"
@@ -113,7 +113,7 @@ class Database:
MAP_XORGKBD,
MAP_XORGXQUARTZ,
MAP_XORGXWIN,
- MAP_RFB,
+ MAP_QNUM,
)
CODE_COLUMNS = {
@@ -282,17 +282,17 @@ class Database:
self.mapto[self.MAP_XORGXWIN][linux] = xorgxwin
self.mapfrom[self.MAP_XORGXWIN][xorgxwin] = linux
- # RFB keycodes are XT scan codes with a slightly
+ # QNUM keycodes are XT scan codes with a slightly
# different encoding of 0xe0 scan codes
if linux in self.mapto[self.MAP_ATSET1]:
at1 = self.mapto[self.MAP_ATSET1][linux]
if at1 > 0x7f:
assert((at1 & ~0x7f) == 0xe000)
- rfb = 0x80 | (at1 & 0x7f)
+ qnum = 0x80 | (at1 & 0x7f)
else:
- rfb = at1
- self.mapto[self.MAP_RFB][linux] = rfb
- self.mapfrom[self.MAP_RFB][rfb] = linux
+ qnum = at1
+ self.mapto[self.MAP_QNUM][linux] = qnum
+ self.mapfrom[self.MAP_QNUM][qnum] = linux
if linux in self.mapname[self.MAP_QCODE]:
qcodeenum = self.mapname[self.MAP_QCODE][linux]