Code cleanup.

docs/rules.mk

@@ -1,8 +1,7 @@
 REPORT := report
 DIAGRAMS := data/diagrams
-PDFLATEX_FLAGS = -halt-on-error -interaction=nonstopmode \
+LATEX = TEXINPUTS=$(d):$(b): pdflatex -halt-on-error -interaction=nonstopmode \
 	-output-directory $(@D) -shell-escape
-LATEX = TEXINPUTS=$(d):$(b): pdflatex $(PDFLATEX_FLAGS)
 REF_WARNING := "Rerun to get cross-references right"
 
 .PHONY: docs report
@@ -22,6 +21,6 @@ $(b)%.pdf: $(d)%.tex
 $(b)$(REPORT).pdf: $(d)$(DIAGRAMS).tex
 
 $(b)$(REPORT).bbl: $(d)$(REPORT).bib
-	BIBINPUTS=$(d) bibtex8 ${@:.bbl=.aux}
+	BIBINPUTS=$(d) bibtex8 $(@:.bbl=.aux)
 	$(LATEX) $(d)$(REPORT).tex
 	$(LATEX) $(d)$(REPORT).tex

src/trackers/__init__.py

@@ -14,8 +14,8 @@ def _register_tracker(tracker_type):
     for gesture_type in tracker_type.gesture_types:
         if gesture_type in _tracker_types:
             raise ValueError('Gesture type "%s" is already registered to '
-                                'tracker type "%s".' % (gesture_type,
-                                _tracker_types[gesture_type].__name__))
+                             'tracker type "%s".' % (gesture_type,
+                             _tracker_types[gesture_type].__name__))
 
         _tracker_types[gesture_type] = tracker_type
 

src/widgets.py

@@ -48,7 +48,7 @@ class CircularWidget(Widget):
         return self.radius
 
     def contains_event(self, event):
-        return self.distance_to(event.get_touch_object()) <= self.radius
+        return event.get_touch_object().distance_to(self) <= self.radius
 
 
 class FullscreenWidget(RectangularWidget):