Fixed inability to use trackball mode on Steam Deck and RSTICK mouse registering (#70)

* Fixed inability to use trackball mode on Steam Deck

* Fixed GUI error when loading mouse option for analog sticks

* Fixed RSTICK not registering mouse events (and possibly others)

Author: Kitsumi

scc/actions.py

@@ -17,7 +17,7 @@
 OUTPUT_360_STICK_MIN, OUTPUT_360_STICK_MAX)
 from scc.constants import STICK_PAD_MAX_HALF, TRIGGER_MIN, TRIGGER_HALF
 from scc.constants import HIPFIRE_NORMAL, HIPFIRE_SENSIBLE, HIPFIRE_EXCLUSIVE
-from scc.constants import LEFT, RIGHT, CPAD, STICK, PITCH, YAW, ROLL
+from scc.constants import LEFT, RIGHT, CPAD, STICK, RSTICK, PITCH, YAW, ROLL
 from scc.constants import PARSER_CONSTANTS, ControllerFlags
 from scc.constants import FE_STICK, FE_TRIGGER, FE_PAD
 from scc.constants import TRIGGER_CLICK, TRIGGER_MAX
@@ -445,6 +445,13 @@ def __init__(self, what, op, value):
 			self.children = RangeOP(SCButtons.X, op, value), RangeOP(SCButtons.Y, op, value)
 			self.min, self.max = float(STICK_PAD_MIN), float(STICK_PAD_MAX)
 			self.op_method = self.cmp_or
+		elif what == RSTICK:
+			# Most special case of all special cases
+			self.axis_name = RSTICK
+			op = "ABS" + op.replace("=", "")
+			self.children = RangeOP(SCButtons.X, op, value), RangeOP(SCButtons.Y, op, value)
+			self.min, self.max = float(STICK_PAD_MIN), float(STICK_PAD_MAX)
+			self.op_method = self.cmp_or
 		else:
 			raise ValueError("'%s' is not trigger nor axis" % (nameof(what), ))
 
@@ -915,6 +922,7 @@ def whole(self, mapper: Mapper, x, y, what):
 		#	mapper.mouse_move(x * self.speed[0] * 0.01, y * self.speed[1] * 0.01)
 		#	mapper.force_event.add(FE_STICK)
 		if ((what == STICK) or
+		    (what == RSTICK) or
 			(what == RIGHT and mapper.controller_flags() & ControllerFlags.HAS_RSTICK)):
 			ratio_x = x / (STICK_PAD_MAX if x > 0 else STICK_PAD_MIN) * copysign(1, x)
 			ratio_y = y / (STICK_PAD_MAX if y > 0 else STICK_PAD_MIN) * copysign(1, y)
@@ -1609,7 +1617,7 @@ def button_release(self, mapper: Mapper):
 
 
 	def whole(self, mapper: Mapper, x, y, what):
-		if what == STICK:
+		if what == STICK or what == RSTICK:
 			# Stick used used as one big button (probably as part of ring bindings)
 			if abs(x) < ButtonAction.STICK_DEADZONE and abs(y) < ButtonAction.STICK_DEADZONE:
 				if self._pressed_key == self.button:
@@ -2128,7 +2136,7 @@ def to_string(self, multiline=False, pad=0):
 
 
 	def whole(self, mapper: Mapper, x, y, what):
-		if what == STICK or mapper.is_touched(what):
+		if what == STICK or what == RSTICK or mapper.is_touched(what):
 			angle = atan2(x, y)
 			distance = sqrt(x*x + y*y)
 			if distance < self._radius_m:
@@ -2143,7 +2151,7 @@ def whole(self, mapper: Mapper, x, y, what):
 
 			if action == self._active:
 				action.whole(mapper, x, y, what)
-			elif what == STICK:
+			elif what == STICK or what == RSTICK:
 				# Stck crossed radius border, so active action is changing.
 				# Simulate centering stick for former...
 				self._active.whole(mapper, 0, 0, what)
@@ -2166,7 +2174,7 @@ def whole(self, mapper: Mapper, x, y, what):
 			# Pad just released
 			self._active.whole(mapper, x, y, what)
 			self._active = NoAction()
-		elif self._active and what == STICK and x == 0 and y == 0:
+		elif self._active and (what == STICK or what == RSTICK) and x == 0 and y == 0:
 			# Stick is centered
 			self._active.whole(mapper, x, y, what)
 			self._active = NoAction()
@@ -2292,7 +2300,7 @@ def whole(self, mapper: Mapper, x, y, what):
 			else:
 				self._old_pos = None
 
-		if mapper.controller_flags() & ControllerFlags.HAS_RSTICK and what == RIGHT:
+		if mapper.controller_flags() & ControllerFlags.HAS_RSTICK and (what == RIGHT or what == RSTICK):
 			self.x.axis(mapper, x, what)
 			self.y.axis(mapper, y, what)
 			mapper.force_event.add(FE_PAD)

scc/gui/ae/axis_action.py

@@ -174,8 +174,12 @@ def load_mouse_action(self, action):
 		cbAxisOutput = self.builder.get_object("cbAxisOutput")
 		self._recursing = True
 		if isinstance(action, MouseAction):
-			self.set_cb(cbMouseOutput, "mouse", 1)
-			self.set_cb(cbAxisOutput, "mouse", 2)
+			if self.editor.get_id() in STICKS:
+				self.set_cb(cbMouseOutput, "mouse_stick", 1)
+				self.set_cb(cbAxisOutput, "mouse_stick", 2)
+			else:
+				self.set_cb(cbMouseOutput, "mouse", 1)
+				self.set_cb(cbAxisOutput, "mouse", 2)
 		elif isinstance(action, XYAction):
 			if isinstance(action.x, AxisAction):
 				if action.x.parameters[0] == Axes.ABS_X:

scc/modifiers.py

@@ -565,7 +565,7 @@ def change(self, mapper, dx, dy, what):
 
 
 	def whole(self, mapper, x, y, what):
-		if mapper.controller_flags() & ControllerFlags.HAS_RSTICK and what == RIGHT:
+		if mapper.controller_flags() & ControllerFlags.HAS_RSTICK and not mapper.controller_flags() & ControllerFlags.IS_DECK and what == RIGHT:
 			return self.action.whole(mapper, x, y, what)
 		if mapper.is_touched(what):
 			if mapper.is_touched(what) and not mapper.was_touched(what):