core: generic: Remove touch rejection cone

It doesn't really work properly at the moment and it is questionably how much
it would really help.

Author: StollD

etc/iptsd.conf

@@ -14,11 +14,6 @@
 ##
 # Disable = false
 
-##
-## Mark contacts around the stylus as palms.
-##
-# CheckCone = true
-
 ##
 ## Ignore all touch inputs if a palm was registered on the display.
 ##
@@ -142,17 +137,6 @@
 ##
 # TipDistance = 0
 
-[Cone]
-##
-## The wideness of the cone in degrees.
-##
-# Angle = 30
-
-##
-## How many centimeters a contact must be away from the stylus to not get blocked.
-##
-# Distance = 5
-
 [DFT]
 # PositionMinAmp = 50
 # PositionMinMag = 2000

src/core/generic/application.hpp

@@ -3,7 +3,6 @@
 #ifndef IPTSD_CORE_GENERIC_APPLICATION_HPP
 #define IPTSD_CORE_GENERIC_APPLICATION_HPP
 
-#include "cone.hpp"
 #include "config.hpp"
 #include "device.hpp"
 #include "dft.hpp"
@@ -88,14 +87,6 @@ class Application {
 	 */
 	DftStylus m_dft;
 
-	/*
-	 * The touch rejection cone has its origin at the current coordinates of the
-	 * stylus. It is rotated in the direction of palm inputs, so that when
-	 * writing with the stylus, the hand holding it has less chance of accidentally
-	 * triggering any inputs.
-	 */
-	Cone m_cone;
-
 public:
 	Application(const Config &config,
 		    const DeviceInfo &info,
@@ -105,7 +96,6 @@ class Application {
 		, m_metadata {metadata}
 		, m_finder {config.contacts()}
 		, m_dft {config, metadata}
-		, m_cone {config.cone_angle, config.cone_distance}
 	{
 		if (m_config.width == 0 || m_config.height == 0)
 			throw std::runtime_error("Invalid config: The screen size is 0!");
@@ -231,18 +221,13 @@ class Application {
 				contact.orientation = 1.0 - contact.orientation;
 		}
 
-		// Update touch rejection cone
-		this->update_touch_cone();
-
 		// Hand off the found contacts to the handler code.
 		this->on_contacts(m_contacts);
 	}
 
 	/*!
 	 * Handles incoming IPTS stylus data.
 	 *
-	 * Position data from the stylus updates the position of the touch rejection cone.
-	 *
 	 * @param[in] data The data to process.
 	 */
 	void process_stylus(const ipts::StylusData &data)
@@ -254,13 +239,6 @@ class Application {
 		corrected.x += off.x();
 		corrected.y += off.y();
 
-		// Scale to physical coordinates
-		const f64 x = corrected.x * m_config.width;
-		const f64 y = corrected.y * m_config.height;
-
-		// Update rejection cone
-		m_cone.update_position(x, y);
-
 		// Hand off the stylus data to the handler code.
 		this->on_stylus(corrected);
 	}
@@ -279,47 +257,6 @@ class Application {
 		this->process_stylus(m_dft.get_stylus());
 	}
 
-	/*!
-	 * Updates the palm rejection cone with the positions of all palms on the display.
-	 *
-	 * Then marks all contacts inside of the cone as palms.
-	 */
-	void update_touch_cone()
-	{
-		// The cone has never seen a position update, so its inactive
-		if (!m_cone.alive())
-			return;
-
-		if (!m_cone.active())
-			return;
-
-		if (!m_config.touch_check_cone)
-			return;
-
-		for (const contacts::Contact<f64> &contact : m_contacts) {
-			if (contact.valid.value_or(true))
-				continue;
-
-			// Scale to physical coordinates
-			const f64 x = contact.mean.x() * m_config.width;
-			const f64 y = contact.mean.y() * m_config.height;
-
-			m_cone.update_direction(x, y);
-		}
-
-		// Mark all contacts inside of the cone as palms
-		for (contacts::Contact<f64> &contact : m_contacts) {
-			if (!contact.valid.value_or(true))
-				continue;
-
-			// Scale to physical coordinates
-			const f64 x = contact.mean.x() * m_config.width;
-			const f64 y = contact.mean.y() * m_config.height;
-
-			contact.valid = m_cone.check(x, y);
-		}
-	}
-
 	/*!
 	 * Calculates the tilt-based offset of the stylus position.
 	 *

src/core/generic/cone.hpp

@@ -24,7 +24,6 @@ class Config {
 
 	// [Touch]
 	bool touch_disable = false;
-	bool touch_check_cone = true;
 	bool touch_disable_on_palm = false;
 	bool touch_disable_on_stylus = false;
 	f64 touch_overshoot = 0.5;
@@ -49,10 +48,6 @@ class Config {
 	bool stylus_disable = false;
 	f64 stylus_tip_distance = 0;
 
-	// [Cone]
-	f64 cone_angle = 30;
-	f64 cone_distance = 5;
-
 	// [DFT]
 	usize dft_position_min_amp = 50;
 	usize dft_position_min_mag = 2000;

src/core/generic/config.hpp

@@ -143,7 +143,6 @@ class ConfigLoader {
 		this->get(ini, "Config", "Height", m_config.height);
 
 		this->get(ini, "Touch", "Disable", m_config.touch_disable);
-		this->get(ini, "Touch", "CheckCone", m_config.touch_check_cone);
 		this->get(ini, "Touch", "DisableOnPalm", m_config.touch_disable_on_palm);
 		this->get(ini, "Touch", "DisableOnStylus", m_config.touch_disable_on_stylus);
 		this->get(ini, "Touch", "Overshoot", m_config.touch_overshoot);
@@ -166,9 +165,6 @@ class ConfigLoader {
 		this->get(ini, "Stylus", "Disable", m_config.stylus_disable);
 		this->get(ini, "Stylus", "TipDistance", m_config.stylus_tip_distance);
 
-		this->get(ini, "Cone", "Angle", m_config.cone_angle);
-		this->get(ini, "Cone", "Distance", m_config.cone_distance);
-
 		this->get(ini, "DFT", "PositionMinAmp", m_config.dft_position_min_amp);
 		this->get(ini, "DFT", "PositionMinMag", m_config.dft_position_min_mag);
 		this->get(ini, "DFT", "PositionExp", m_config.dft_position_exp);