From dd7b5ac462f5be2d6bee9d61f243e5c32140f175 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 10 Dec 2017 13:37:59 -0500
Subject: fix mods being able to change cursor position reported to other mods

---
 src/SMAPI/Events/EventArgsInput.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI/Events/EventArgsInput.cs')

diff --git a/src/SMAPI/Events/EventArgsInput.cs b/src/SMAPI/Events/EventArgsInput.cs
index 54ce9b53..ee15fd27 100644
--- a/src/SMAPI/Events/EventArgsInput.cs
+++ b/src/SMAPI/Events/EventArgsInput.cs
@@ -16,7 +16,7 @@ namespace StardewModdingAPI.Events
         public SButton Button { get; }
 
         /// <summary>The current cursor position.</summary>
-        public ICursorPosition Cursor { get; set; }
+        public ICursorPosition Cursor { get; }
 
         /// <summary>Whether the input is considered a 'click' by the game for enabling action.</summary>
         [Obsolete("Use " + nameof(EventArgsInput.IsActionButton) + " or " + nameof(EventArgsInput.IsUseToolButton) + " instead")] // deprecated in SMAPI 2.1
-- 
cgit 


From 2c5532f4ab0d0bf4ce5a4bc376cf8bb5fb803f11 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 10 Dec 2017 13:43:05 -0500
Subject: add e.IsSuppressed to input event args

---
 docs/release-notes.md              | 1 +
 src/SMAPI/Events/EventArgsInput.cs | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'src/SMAPI/Events/EventArgsInput.cs')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 16ed9af5..02e75f3d 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,6 +1,7 @@
 # Release notes
 ## 2.3
 * For modders:
+  * Added `IsSuppressed` to input events so mods can optionally avoid handling a key another mod already handled.
   * Fixed error when using the reflection API accesses with a property with either `get` and `set` missing.
   * Fixed issue where a mod could change the cursor position reported to other mods.
 
diff --git a/src/SMAPI/Events/EventArgsInput.cs b/src/SMAPI/Events/EventArgsInput.cs
index ee15fd27..a5325b76 100644
--- a/src/SMAPI/Events/EventArgsInput.cs
+++ b/src/SMAPI/Events/EventArgsInput.cs
@@ -28,6 +28,9 @@ namespace StardewModdingAPI.Events
         /// <summary>Whether the input should use tools on the affected tile.</summary>
         public bool IsUseToolButton { get; }
 
+        /// <summary>Whether a mod has indicated the key was already handled.</summary>
+        public bool IsSuppressed { get; private set; }
+
 
         /*********
         ** Public methods
@@ -55,6 +58,9 @@ namespace StardewModdingAPI.Events
         /// <param name="button">The button to suppress.</param>
         public void SuppressButton(SButton button)
         {
+            if (button == this.Button)
+                this.IsSuppressed = true;
+
             // keyboard
             if (button.TryGetKeyboard(out Keys key))
                 Game1.oldKBState = new KeyboardState(Game1.oldKBState.GetPressedKeys().Union(new[] { key }).ToArray());
-- 
cgit