Skip to content

Fix sticky keys for thumb shift mode #45

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

Open
tychiu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix sticky keys for thumb shift mode #45

Show file tree
Hide file tree
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
37 changes: 34 additions & 3 deletions engine/python2/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ def __reset(self):
self._H = 0
self._RMM = 0
self._RSS = 0
self._MS = 0 # modifier state
self._CM = 0 # command memory
if self.__idle_id != 0:
GLib.source_remove(self.__idle_id)
self.__idle_id = 0
Expand Down Expand Up @@ -1827,9 +1829,8 @@ def insert(keyval):
return ret
except:
pass

def cmd_exec(keyval, state=0):
key = self._mk_key(keyval, state)

def __cmd_exec(key, keyval, state):
for cmd in self.__keybind.get(key, []):
if config.DEBUG:
print 'cmd =', cmd
Expand All @@ -1840,6 +1841,30 @@ def cmd_exec(keyval, state=0):
printerr('Error command: %s: %s' % (cmd, str(err)))
return False

def cmd_exec(keyval, state=0):
key = self._mk_key(keyval, state)
pair = eval(key)
self._MS = pair[0]
self._CM = pair[1]
return __cmd_exec(key, keyval, state)

def cmd_term(keyval, state=0):
if self._MS == 0 and self._CM == 0:
return False

key = self._mk_key(keyval, state)
pair = eval(key)

prev_keyval = self._CM | IBus.ModifierType.RELEASE_MASK
prev_state = self._MS | IBus.ModifierType.RELEASE_MASK
prev_key = repr([int(prev_state), int(prev_keyval)])

self._MS = 0
self._CM = 0

__cmd_exec(prev_key, prev_keyval, prev_state)
return __cmd_exec(key, pair[1], pair[0])

def RS():
return self.__thumb.get_rs()

Expand Down Expand Up @@ -1874,6 +1899,12 @@ def T2():
self._RSS = 0
elif keyval == self._RMM:
self._RMM = 0
elif keyval not in self.__thumb.get_chars() or state != 0:
if cmd_term(keyval, state):
return True
elif not self.__preedit_ja_string.is_empty():
return True
return False
else:
if keyval in [LS(), RS()] and state == 0:
if self._SS:
Expand Down
37 changes: 34 additions & 3 deletions engine/python3/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ def __reset(self):
self._H = 0
self._RMM = 0
self._RSS = 0
self._MS = 0 # modifier state
self._CM = 0 # command memory
if self.__idle_id != 0:
GLib.source_remove(self.__idle_id)
self.__idle_id = 0
Expand Down Expand Up @@ -1822,9 +1824,8 @@ def insert(keyval):
return ret
except:
pass

def cmd_exec(keyval, state=0):
key = self._mk_key(keyval, state)

def __cmd_exec(key, keyval, state):
for cmd in self.__keybind.get(key, []):
if config.DEBUG:
print('cmd =', cmd)
Expand All @@ -1835,6 +1836,30 @@ def cmd_exec(keyval, state=0):
printerr('Error command: %s: %s' % (cmd, str(err)))
return False

def cmd_exec(keyval, state=0):
key = self._mk_key(keyval, state)
pair = eval(key)
self._MS = pair[0]
self._CM = pair[1]
return __cmd_exec(key, keyval, state)

def cmd_term(keyval, state=0):
if self._MS == 0 and self._CM == 0:
return False

key = self._mk_key(keyval, state)
pair = eval(key)

prev_keyval = self._CM | IBus.ModifierType.RELEASE_MASK
prev_state = self._MS | IBus.ModifierType.RELEASE_MASK
prev_key = repr([int(prev_state), int(prev_keyval)])

self._MS = 0
self._CM = 0

__cmd_exec(prev_key, prev_keyval, prev_state)
return __cmd_exec(key, pair[1], pair[0])

def RS():
return self.__thumb.get_rs()

Expand Down Expand Up @@ -1869,6 +1894,12 @@ def T2():
self._RSS = 0
elif keyval == self._RMM:
self._RMM = 0
elif keyval not in self.__thumb.get_chars() or state != 0:
if cmd_term(keyval, state):
return True
elif not self.__preedit_ja_string.is_empty():
return True
return False
else:
if keyval in [LS(), RS()] and state == 0:
if self._SS:
Expand Down