rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix eventFilter logic to not handle same event multiple times

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-25 06:22:01 +02:00
parent 84682f90fa
commit 8f9d7542a6
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qutebrowser/keyinput/modes.py
View File

@ -23,6 +23,7 @@ Module attributes:
import logging import logging
from PyQt5.QtGui import QWindow
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent
import qutebrowser.config.config as config import qutebrowser.config.config as config
@ -166,7 +167,7 @@ class ModeManager(QObject):
self._forward_unbound_keys = config.get('general', self._forward_unbound_keys = config.get('general',
'forward_unbound_keys') 'forward_unbound_keys')
def eventFilter(self, _obj, evt): def eventFilter(self, obj, evt):
"""Filter all events based on the currently set mode. """Filter all events based on the currently set mode.
Also calls the real keypress handler. Also calls the real keypress handler.
@ -177,21 +178,29 @@ class ModeManager(QObject):
if self.mode is None: if self.mode is None:
# We got events before mode is set, so just pass them through. # We got events before mode is set, so just pass them through.
return False return False
handler = self._handlers[self.mode]
typ = evt.type() typ = evt.type()
if typ not in [QEvent.KeyPress, QEvent.KeyRelease]: if typ not in [QEvent.KeyPress, QEvent.KeyRelease]:
# We're not interested in non-key-events so we pass them through. # We're not interested in non-key-events so we pass them through.
return False return False
logging.debug("Got event {} for {}".format(debug.EVENTS[typ], _obj)) logging.debug("Got event {} for {}".format(debug.EVENTS[typ],
obj.__class__))
if not isinstance(obj, QWindow):
# We already handled this same event at some point earlier, so
# we're not interested in it anymore.
return False
handler = self._handlers[self.mode]
if self.mode in self.passthrough: if self.mode in self.passthrough:
# We're currently in a passthrough mode so we pass everything # We're currently in a passthrough mode so we pass everything
# through.*and* let the passthrough keyhandler know. # through.*and* let the passthrough keyhandler know.
# FIXME what if we leave the passthrough mode right here? # FIXME what if we leave the passthrough mode right here?
self.key_pressed.emit(evt) if typ == QEvent.KeyPress:
if handler is not None: self.key_pressed.emit(evt)
handler(evt) if handler is not None:
handler(evt)
return False return False
elif typ == QEvent.KeyPress: if typ == QEvent.KeyPress:
# KeyPress in a non-passthrough mode - call handler and filter # KeyPress in a non-passthrough mode - call handler and filter
# event from widgets (unless unhandled and configured to pass # event from widgets (unless unhandled and configured to pass
# unhandled events through) # unhandled events through)
@ -205,6 +214,6 @@ class ModeManager(QObject):
else: else:
return True return True
else: else:
# KeyRelease in a non-passthrough mode - filter event and ignore it # KeyRelease in a non-passthrough mode - filter event and
# entirely. # ignore it entirely.
return True return True