Fixed the update function of the keymap cache

petli · petli · commit ff61d498f5e4 · 2001-01-11T15:13:05.000Z
diff --git a/Xlib/ChangeLog b/Xlib/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-10    <petli@cendio.se>
+
+	* display.py (Display._update_keymap): The first half of the
+	update algorithm operated on an earlier type of code->sym map than
+	the second half.  Stupid, stupid.  It would have been nice with a
+	type-checker now.
+
 Tue Jan  9 13:03:19 2001  Peter Liljenberg  <petli@cendio.se>
 
 	* display.py (Display._update_keymap): Fixed call to append with
diff --git a/Xlib/display.py b/Xlib/display.py
@@ -1,4 +1,4 @@
-# $Id: display.py,v 1.13 2001-01-09 12:05:06 petli Exp $
+# $Id: display.py,v 1.14 2001-01-11 15:13:05 petli Exp $
 #
 # Xlib.display -- high level display object
 #
@@ -249,6 +249,16 @@ def add_extension_error(self, code, err):
     ### keymap cache implementation
     ###
 
+    # The keycode->keysym map is stored in a list with 256 elements.
+    # Each element represents a keycode, and the tuple elements are
+    # the keysyms bound to the key.
+
+    # The keysym->keycode map is stored in a mapping, where the keys
+    # are keysyms.  The values are a sorted list of tuples with two
+    # elements each: (index, keycode)
+    # keycode is the code for a key to which this keysym is bound, and
+    # index is the keysyms index in the map for that keycode.
+
     def keycode_to_keysym(self, keycode, index):
 	try:
 	    return self._keymap_codes[keycode][index]
@@ -263,7 +273,8 @@ def keysym_to_keycode(self, keysym):
 
     def keysym_to_keycodes(self, keysym):
 	try:
-	    return map(lambda x: x[1], self._keymap_syms[keysym])
+	    # Copy the map list, reversing the arguments
+	    return map(lambda x: (x[1], x[0]), self._keymap_syms[keysym])
 	except KeyError:
 	    return []
     
@@ -280,37 +291,36 @@ def _update_keymap(self, first_keycode, count):
 	# Delete all sym->code maps for the changed codes
 	
 	lastcode = first_keycode + count
-	for keysym, code in self._keymap_syms.items():
-	    if code >= first_keycode and code < lastcode:
-		symcodes = self._keymap_syms[keysym]
-		i = 0
-		while i < len(symcodes):
-		    if symcodes[i][1] == code:
-			del symcodes[i]
-		    else:
-			i = i + 1
-
-		
+	for keysym, codes in self._keymap_syms.items():
+	    i = 0
+	    while i < len(codes):
+		code = codes[i][1]
+		if code >= first_keycode and code < lastcode:
+		    del codes[i]
+		else:
+		    i = i + 1
+
+	# Get the new keyboard mapping
 	keysyms = self.get_keyboard_mapping(first_keycode, count)
 
 	# Replace code->sym map with the new map
 	self._keymap_codes[first_keycode:lastcode] = keysyms
 
 	# Update sym->code map
-	i = first_keycode
+	code = first_keycode
 	for syms in keysyms:
-	    j = 0
+	    index = 0
 	    for sym in syms:
 		if sym != X.NoSymbol:
 		    if self._keymap_syms.has_key(sym):
 			symcodes = self._keymap_syms[sym]
-			symcodes.append((j, i))
+			symcodes.append((index, code))
 			symcodes.sort()
 		    else:
-			self._keymap_syms[sym] = [(j, i)]
+			self._keymap_syms[sym] = [(index, code)]
 			
-		j = j + 1
-	    i = i + 1
+		index = index + 1
+	    code = code + 1
 
 	
     ###
