summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Konrath <ben@bagu.org>2009-11-19 14:13:56 -0500
committerBen Konrath <ben@bagu.org>2009-11-19 14:13:56 -0500
commit01d7f446a1adb139f8db65a7d1c9bed680833fce (patch)
tree2acb969b7201e292168411f3c09d02226155ae63
parentbfcb018047ce7f295529bac2022a6e8cbfb4bdc2 (diff)
downloadcaribou-01d7f446a1adb139f8db65a7d1c9bed680833fce.tar.gz
don't use lambdas for callbacks
-rw-r--r--src/keyboard.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/keyboard.py b/src/keyboard.py
index 2c8f0b7..a3df086 100644
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@ -28,7 +28,7 @@ class CaribouKeyboard(gtk.Frame):
if isinstance(key, str):
button = gtk.Button(key)
char = ord(key.decode('utf-8'))
- button.connect("clicked", lambda w, d: self.__send_unicode(d), char)
+ button.connect("clicked", self.__send_unicode, char)
elif isinstance(key, tuple):
button = gtk.Button(key[0])
# check if this key is a layout switch key or not
@@ -37,7 +37,7 @@ class CaribouKeyboard(gtk.Frame):
button.connect("clicked", self.__change_layout, key[1])
else:
# regular key
- button.connect("clicked", lambda w, d: self.__send_keysym(d), key[1])
+ button.connect("clicked", self.__send_keysym, key[1])
else:
pass #TODO throw error here
@@ -50,13 +50,13 @@ class CaribouKeyboard(gtk.Frame):
self.add(self._layouts[0])
self.show_all()
- def __send_unicode(self, char):
- self._vk.press_unicode(char)
- self._vk.release_unicode(char)
+ def __send_unicode(self, widget, data):
+ self._vk.press_unicode(data)
+ self._vk.release_unicode(data)
- def __send_keysym(self, keysym):
- self._vk.press_keysym(keysym)
- self._vk.release_keysym(keysym)
+ def __send_data(self, widget, data):
+ self._vk.press_data(data)
+ self._vk.release_data(data)
def __change_layout(self, widget, data):
label = widget.get_label()