Merge lp:~iammuneeb/screenkey/numpad-5 into lp:screenkey

[Muneeb Shaikh]

Fix for numpad key 5. Removed trailing whitespaces. Removed trailing space after numpad key 7.

[lp:~iammuneeb/screenkey/numpad-5]

52. By Muneeb Shaikh on 2012-02-08

added missing keys on numpad

[Pablo SEMINARIO (pabluk)]

Thanks for the fixes Muneeb

review: Approve

[Muneeb Shaikh (iammuneeb)]

@Pablo
I had also added remaining missing keys on numpad such as Enter key, +, -, *, / etc, but I didn't notice them before submitting the patch. I had added them to my branch but I couldn't propose merge as LP told me that there's already a merge request. You can take a diff and apply or I'll send the merge later.

[Pablo SEMINARIO (pabluk)]

@Muneeb

I merged the latest changes from your branch. If there are new changes to add from your branch can you please propose a new merge.

Thanks!

[Muneeb Shaikh (iammuneeb)]

@Pablo

You have added all the changes which I had made. If I make any changes I'll request new merge.

PS: I'm new to bzr and LP, and I was confused about sending two merge request one after the other, but LP took the latest changes as well, so I didn't need to make second merge request.

=== modified file 'Screenkey/listenkbd.py'
--- Screenkey/listenkbd.py	2011-02-27 18:32:01 +0000
+++ Screenkey/listenkbd.py	2012-02-08 12:26:18 +0000
@@ -3,12 +3,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -31,18 +31,18 @@
     'XK_Return':u'\u23CE ',
     'XK_Space':u' ',
     'XK_Caps_Lock':_('Caps '),
-    'XK_F1':u'F1 ', 
-    'XK_F2':u'F2 ', 
-    'XK_F3':u'F3 ', 
-    'XK_F4':u'F4 ', 
-    'XK_F5':u'F5 ', 
-    'XK_F6':u'F6 ', 
-    'XK_F7':u'F7 ', 
-    'XK_F8':u'F8 ', 
-    'XK_F9':u'F9 ', 
-    'XK_F10':u'F10 ', 
-    'XK_F11':u'F11 ', 
-    'XK_F12':u'F12 ', 
+    'XK_F1':u'F1 ',
+    'XK_F2':u'F2 ',
+    'XK_F3':u'F3 ',
+    'XK_F4':u'F4 ',
+    'XK_F5':u'F5 ',
+    'XK_F6':u'F6 ',
+    'XK_F7':u'F7 ',
+    'XK_F8':u'F8 ',
+    'XK_F9':u'F9 ',
+    'XK_F10':u'F10 ',
+    'XK_F11':u'F11 ',
+    'XK_F12':u'F12 ',
     'XK_Home':_('Home '),
     'XK_Up':u'\u2191',
     'XK_Page_Up':_('PgUp '),
@@ -53,7 +53,7 @@
     'XK_Next':_('PgDn '),
     'XK_Insert':_('Ins '),
     'XK_Delete':_('Del '),
-    'XK_KP_Home':u'(7) ',
+    'XK_KP_Home':u'(7)',
     'XK_KP_Up':u'(8)',
     'XK_KP_Prior':u'(9)',
     'XK_KP_Left':u'(4)',
@@ -61,6 +61,15 @@
     'XK_KP_End':u'(1)',
     'XK_KP_Down':u'(2)',
     'XK_KP_Page_Down':u'(3)',
+    'XK_KP_Begin':u'(5)',
+    'XK_KP_Insert':u'(0)',
+    'XK_KP_Delete':u'(.)',
+    'XK_KP_Add':u'(+)',
+    'XK_KP_Subtract':u'(-)',
+    'XK_KP_Multiply':u'(*)',
+    'XK_KP_Divide':u'(/)',
+    'XK_Num_Lock':u'NumLock ',
+    'XK_KP_Enter':u'\u23CE ',
 }
 
 class ListenKbd(threading.Thread):
@@ -132,13 +141,13 @@
         else:
             self.label.set_text("")
         self.label.emit("text-changed")
- 
+
     def key_press(self, reply):
 
         # FIXME:
         # This is not the most efficient way to detect the
         # use of sudo/gksudo but it works.
-        sudo_is_running = subprocess.call(['ps', '-C', 'sudo'], 
+        sudo_is_running = subprocess.call(['ps', '-C', 'sudo'],
                     stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if not sudo_is_running:
             return
@@ -156,7 +165,7 @@
         data = reply.data
         key = None
         while len(data):
-            event, data = rq.EventField(None).parse_binary_value(data, 
+            event, data = rq.EventField(None).parse_binary_value(data,
                                     self.record_dpy.display, None, None)
             if event.type in [X.KeyPress, X.KeyRelease]:
                 if self.mode == MODE_NORMAL:
@@ -175,9 +184,9 @@
         if event.detail in self.keymap:
             key_normal, key_shift, key_dead, key_deadshift = \
                                             self.keymap[event.detail]
-            self.logger.debug("Key %s(keycode) %s. Symbols %s" % 
-                (event.detail, 
-                 event.type == X.KeyPress and "pressed" or "released", 
+            self.logger.debug("Key %s(keycode) %s. Symbols %s" %
+                (event.detail,
+                 event.type == X.KeyPress and "pressed" or "released",
                  self.keymap[event.detail])
                 )
         else:
@@ -192,7 +201,7 @@
             else:
                 self.cmd_keys['alt'] = False
             return
-        # Meta key 
+        # Meta key
         # Fixme: it must use self.modifiers['mod5']
         #        but doesn't work
         if event.detail == 108:
@@ -201,7 +210,7 @@
             else:
                 self.cmd_keys['meta'] = False
             return
-        # Super key 
+        # Super key
         if event.detail in self.modifiers['mod4']:
             if event.type == X.KeyPress:
                 self.cmd_keys['super'] = True