From 98596d439f38cb81a8bbc46c01c3533acbf48fd3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 May 2015 23:17:23 +0200
Subject: [PATCH] Emit ClickTarget from HintManager.start_hinting.

This is much clearer than transmitting a string which must match the
ClickTarget enum.
---
 qutebrowser/browser/hints.py   | 28 ++++++++++++++++------------
 qutebrowser/browser/webpage.py | 10 +++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 219b472ff..35775620c 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -117,7 +117,7 @@ class HintManager(QObject):
         mouse_event: Mouse event to be posted in the web view.
                      arg: A QMouseEvent
         start_hinting: Emitted when hinting starts, before a link is clicked.
-                       arg: The hinting target name.
+                       arg: The ClickTarget to use.
         stop_hinting: Emitted after a link was clicked.
     """
 
@@ -137,7 +137,7 @@ class HintManager(QObject):
     }
 
     mouse_event = pyqtSignal('QMouseEvent')
-    start_hinting = pyqtSignal(str)
+    start_hinting = pyqtSignal(usertypes.ClickTarget)
     stop_hinting = pyqtSignal()
 
     def __init__(self, win_id, tab_id, parent=None):
@@ -413,22 +413,26 @@ class HintManager(QObject):
             elem: The QWebElement to click.
             context: The HintContext to use.
         """
-        if context.target == Target.rapid:
-            target = Target.tab_bg
-        elif context.target == Target.rapid_win:
-            target = Target.window
-        else:
-            target = context.target
+        target_mapping = {
+            Target.rapid: usertypes.ClickTarget.tab_bg,
+            Target.rapid_win: usertypes.ClickTarget.window,
+            Target.normal: usertypes.ClickTarget.normal,
+            Target.tab: usertypes.ClickTarget.tab,
+            Target.tab_bg: usertypes.ClickTarget.tab_bg,
+            Target.window: usertypes.ClickTarget.window,
+            Target.hover: usertypes.ClickTarget.normal,
+        }
         # FIXME Instead of clicking the center, we could have nicer heuristics.
         # e.g. parse (-webkit-)border-radius correctly and click text fields at
         # the bottom right, and everything else on the top left or so.
         # https://github.com/The-Compiler/qutebrowser/issues/70
         pos = elem.rect_on_view().center()
-        action = "Hovering" if target == Target.hover else "Clicking"
+        action = "Hovering" if context.target == Target.hover else "Clicking"
         log.hints.debug("{} on '{}' at {}/{}".format(
             action, elem, pos.x(), pos.y()))
-        self.start_hinting.emit(target.name)
-        if target in (Target.tab, Target.tab_bg, Target.window):
+        self.start_hinting.emit(target_mapping[context.target])
+        if context.target in [Target.tab, Target.tab_bg, Target.window,
+                              Target.rapid, Target.rapid_win]:
             modifiers = Qt.ControlModifier
         else:
             modifiers = Qt.NoModifier
@@ -436,7 +440,7 @@ class HintManager(QObject):
             QMouseEvent(QEvent.MouseMove, pos, Qt.NoButton, Qt.NoButton,
                         Qt.NoModifier),
         ]
-        if target != Target.hover:
+        if context.target != Target.hover:
             events += [
                 QMouseEvent(QEvent.MouseButtonPress, pos, Qt.LeftButton,
                             Qt.LeftButton, modifiers),
diff --git a/qutebrowser/browser/webpage.py b/qutebrowser/browser/webpage.py
index f129151df..005a6e300 100644
--- a/qutebrowser/browser/webpage.py
+++ b/qutebrowser/browser/webpage.py
@@ -427,14 +427,10 @@ class BrowserPage(QWebPage):
         """Emitted before a hinting-click takes place.
 
         Args:
-            hint_target: A string to set self._hint_target to.
+            hint_target: A ClickTarget member to set self._hint_target to.
         """
-        t = getattr(usertypes.ClickTarget, hint_target, None)
-        if t is None:
-            return
-        log.webview.debug("Setting force target to {}/{}".format(
-            hint_target, t))
-        self._hint_target = t
+        log.webview.debug("Setting force target to {}".format(hint_target))
+        self._hint_target = hint_target
 
     @pyqtSlot()
     def on_stop_hinting(self):