Key filter enancements, new event handler example

This commit is contained in:
itdominator 2023-03-19 15:37:43 -05:00
parent b8a058e572
commit ba94493fb8
6 changed files with 31 additions and 7 deletions

View File

@ -32,6 +32,7 @@ if __name__ == "__main__":
# Add long and short arguments
parser.add_argument("--debug", "-d", default="false", help="Do extra console messaging.")
parser.add_argument("--trace-debug", "-td", default="false", help="Disable saves, ignore IPC lock, do extra console messaging.")
parser.add_argument("--new-tab", "-nt", default="false", help="Opens a 'New Tab' if a handler is set for it.")
parser.add_argument("--file", "-f", default="default", help="JUST SOME FILE ARG.")
# Read arguments (If any...)

View File

@ -38,9 +38,9 @@ class Controller(DummyMixin, SignalsMixins, ControllerData):
self.window.connect("key-press-event", self.on_global_key_press_controller)
self.window.connect("key-release-event", self.on_global_key_release_controller)
def _subscribe_to_events(self):
event_system.subscribe("handle_file_from_ipc", self.handle_file_from_ipc)
event_system.subscribe("tggl_top_main_menubar", self._tggl_top_main_menubar)
def load_glade_file(self):
self.builder = Gtk.Builder()
@ -54,3 +54,6 @@ class Controller(DummyMixin, SignalsMixins, ControllerData):
def get_core_widget(self):
return self.core_widget
def _tggl_top_main_menubar(self):
print("_tggl_top_main_menubar > stub...")

View File

@ -17,6 +17,7 @@ class ControllerData:
self.window = settings.get_main_window()
self.builder = None
self.core_widget = None
self.was_midified_key = False
self.ctrl_down = False
self.shift_down = False
self.alt_down = False

View File

@ -27,6 +27,10 @@ class KeyboardSignalsMixin:
def on_global_key_press_controller(self, eve, user_data):
keyname = Gdk.keyval_name(user_data.keyval).lower()
modifiers = Gdk.ModifierType(user_data.get_state() & ~Gdk.ModifierType.LOCK_MASK)
self.was_midified_key = True if modifiers != 0 else False
if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
if "control" in keyname:
self.ctrl_down = True
@ -38,7 +42,11 @@ class KeyboardSignalsMixin:
def on_global_key_release_controller(self, widget, event):
""" Handler for keyboard events """
keyname = Gdk.keyval_name(event.keyval).lower()
modifiers = Gdk.ModifierType(event.get_state() & ~Gdk.ModifierType.LOCK_MASK)
if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
should_return = self.was_midified_key and (self.ctrl_down or self.shift_down or self.alt_down)
if "control" in keyname:
self.ctrl_down = False
if "shift" in keyname:
@ -46,7 +54,16 @@ class KeyboardSignalsMixin:
if "alt" in keyname:
self.alt_down = False
# NOTE: In effect a filter after releasing a modifier and we have a modifier mapped
if should_return:
self.was_midified_key = False
return
mapping = keybindings.lookup(event)
logger.debug(f"on_global_key_release_controller > key > {keyname}")
logger.debug(f"on_global_key_release_controller > keyval > {event.keyval}")
logger.debug(f"on_global_key_release_controller > mapping > {mapping}")
if mapping:
# See if in controller scope
try:
@ -65,7 +82,9 @@ class KeyboardSignalsMixin:
logger.debug(f"on_global_key_release_controller > key > {keyname}")
if self.ctrl_down:
if keyname in ["1", "kp_1", "2", "kp_2", "3", "kp_3", "4", "kp_4"]:
if not keyname in ["1", "kp_1", "2", "kp_2", "3", "kp_3", "4", "kp_4"]:
self.handle_key_event_system(None, mapping)
else:
...
def handle_key_event_system(self, sender, eve_type):

View File

@ -11,7 +11,7 @@ from gi.repository import Gdk
def err(log = ""):
def logger(log = ""):
print(log)
@ -68,7 +68,7 @@ class Keybindings:
# Does much the same, but with worse error handling.
# keyval, mask = Gtk.accelerator_parse(binding)
except KeymapError as e:
err(f"Keybinding reload failed to parse binding '{binding}': {e}")
logger(f"Keybinding reload failed to parse binding '{binding}': {e}")
else:
if mask & Gdk.ModifierType.SHIFT_MASK:
if keyval == Gdk.KEY_Tab:
@ -120,7 +120,7 @@ class Keybindings:
Gdk.ModifierType(event.get_state() & ~Gdk.ModifierType.LOCK_MASK),
event.group)
except TypeError:
err(f"Keybinding lookup failed to translate keyboard event: {dir(event)}")
logger(f"Keybinding lookup failed to translate keyboard event: {dir(event)}")
return None
mask = (event.get_state() & ~consumed) & self._masks

View File

@ -5,7 +5,7 @@
"open_terminal" : "F4",
"refresh_tab" : ["F5", "<Control>r"],
"delete_files" : "Delete",
"tggl_top_main_menubar" : "Alt",
"tggl_top_main_menubar" : "Alt_L",
"trash_files" : "<Shift><Control>t",
"tear_down" : "<Control>q",
"go_up" : "<Control>Up",