From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 16 Oct 2018 15:09:50 +0000 (+0300)
Subject: X11: Allow toggling mouse_support off
X-Git-Tag: NetHack-3.6.2_Released~185^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3c8acfeebd78840c35d93898790d5434c1c0cf2;p=nethack

X11: Allow toggling mouse_support off

Prevents accidental mouse clicks on the map.
---

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index 904ac86c1..6ccf7414f 100644
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -237,6 +237,7 @@ X11: handle paged menu control keys
 X11: remember perm_invent window geometry
 X11: handle X errors via panic
 X11: don't reuse perm_invent window for picking an object
+X11: obey mouse_support and allow toggling it in game
 
 
 General New Features
diff --git a/win/X11/winX.c b/win/X11/winX.c
index c79376c35..10462c978 100644
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -1307,6 +1307,7 @@ char **argv;
 
     /* add another option that can be set */
     set_wc_option_mod_status(WC_TILED_MAP, SET_IN_GAME);
+    set_option_mod_status("mouse_support", SET_IN_GAME);
 
     load_default_resources(); /* create default_resource_data[] */
 
diff --git a/win/X11/winmap.c b/win/X11/winmap.c
index ec5e5fa4a..3d5ab1d99 100644
--- a/win/X11/winmap.c
+++ b/win/X11/winmap.c
@@ -1029,6 +1029,9 @@ Cardinal *num_params;
 
     switch (event->type) {
     case ButtonPress:
+        if (!iflags.wc_mouse_support)
+            return;
+
         button = (XButtonEvent *) event;
 #ifdef VERBOSE_INPUT
         printf("button press\n");