Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt at fixing #974; I don't have a keyboard with a keypad right n… #979

Merged
merged 1 commit into from
May 10, 2017
Merged

Attempt at fixing #974; I don't have a keyboard with a keypad right n… #979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions pwnlib/term/key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

__all__ = ['getch', 'getraw', 'get', 'unget']


# When set, convert keypad codes into regular key presses, e.g. "+" instead of
# `<kp plus>`
FLAG_CONVERTKP = True

try: _fd = sys.stdin.fileno()
except Exception: _fd = file('/dev/null', 'r').fileno()
Expand Down Expand Up @@ -310,7 +312,24 @@ def _csi_R(cmd, args):
}

_csi_ss3kp = {

'M': (kc.TYPE_KEYSYM, kc.KEY_KPENTER , None),
'X': (kc.TYPE_KEYSYM, kc.KEY_KPEQUALS, '='),
'j': (kc.TYPE_KEYSYM, kc.KEY_KPMULT , '*'),
'k': (kc.TYPE_KEYSYM, kc.KEY_KPPLUS , '+'),
'l': (kc.TYPE_KEYSYM, kc.KEY_KPCOMMA , ','),
'm': (kc.TYPE_KEYSYM, kc.KEY_KPMINUS , '-'),
'n': (kc.TYPE_KEYSYM, kc.KEY_KPPERIOD, '.'),
'o': (kc.TYPE_KEYSYM, kc.KEY_KPDIV , '/'),
'p': (kc.TYPE_KEYSYM, kc.KEY_KP0 , '0'),
'q': (kc.TYPE_KEYSYM, kc.KEY_KP1 , '1'),
'r': (kc.TYPE_KEYSYM, kc.KEY_KP2 , '2'),
's': (kc.TYPE_KEYSYM, kc.KEY_KP3 , '3'),
't': (kc.TYPE_KEYSYM, kc.KEY_KP4 , '4'),
'u': (kc.TYPE_KEYSYM, kc.KEY_KP5 , '5'),
'v': (kc.TYPE_KEYSYM, kc.KEY_KP6 , '6'),
'w': (kc.TYPE_KEYSYM, kc.KEY_KP7 , '7'),
'x': (kc.TYPE_KEYSYM, kc.KEY_KP8 , '8'),
'y': (kc.TYPE_KEYSYM, kc.KEY_KP9 , '9'),
}

_csi_funcs = {
Expand Down Expand Up @@ -373,14 +392,14 @@ def _peekkey_ss3(offset):
cmd = _cbuf[offset]
if cmd < 0x40 or cmd >= 0x80:
return
_cbuf = _cbuf[numb:] # XXX: numb is not defined
_cbuf = _cbuf[offset:]

if chr(cmd) in _csi_ss3s:
return Key(*_csi_ss3s[chr(cmd)])

if chr(cmd) in _csi_ss3kp:
t, c, a = _csi_ss3kp[chr(cmd)]
if CONVERTKP and a: # XXX: CONVERTKP is not defined
if FLAG_CONVERTKP and a:
return Key(kc.TYPE_UNICODE, a)
else:
return Key(t, c)
Expand Down