Enable mouse input for uilist

src/inventory_ui.cpp

@@ -1424,11 +1424,12 @@ inventory_entry *inventory_selector::find_entry_by_coordinate( point coordinate
         return entry.is_selectable();
     };
     for( inventory_column *column : columns ) {
+        if( column->visible() == false ) {
+            continue;
+        }
         std::vector<inventory_entry *> entries = column->get_entries( filter_to_selected );
         for( inventory_entry *entry : entries ) {
-            if( entry->drawn_info.text_x_start <= coordinate.x &&
-                coordinate.x <= entry->drawn_info.text_x_end &&
-                entry->drawn_info.y == coordinate.y ) {
+            if( entry->drawn_info.include_point( coordinate ) ) {
                 return entry;
             }
         }

src/inventory_ui.h

@@ -52,6 +52,14 @@ struct inventory_entry_drawn_info {
     int text_x_start;
     int text_x_end;
     int y;
+    bool include_point( point p )const {
+        if( text_x_start <= p.x &&
+            p.x <= text_x_end &&
+            y == p.y ) {
+            return true;
+        }
+        return false;
+    }
 };
 
 class inventory_entry

src/ui.cpp

@@ -613,7 +613,12 @@ void uilist::show()
                 // to be used.
                 const auto entry = utf8_wrapper( ei == selected ? remove_color_tags( entries[ ei ].txt ) :
                                                  entries[ ei ].txt );
-                trim_and_print( window, point( pad_left + 4, estart + si ),
+                int x = pad_left + 4;
+                int y = estart + si;
+                entries[ei].drawn_info.text_x_start = x;
+                entries[ei].drawn_info.text_x_end = x + max_entry_len;
+                entries[ei].drawn_info.y = y;
+                trim_and_print( window, point( x, y ),
                                 max_entry_len, co, "%s", entry.c_str() );
 
                 if( max_column_len && !entries[ ei ].ctxt.empty() ) {
@@ -790,6 +795,7 @@ void uilist::query( bool loop, int timeout )
     if( allow_cancel ) {
         ctxt.register_action( "QUIT" );
     }
+    ctxt.register_action( "SELECT" );
     ctxt.register_action( "CONFIRM" );
     ctxt.register_action( "FILTER" );
     ctxt.register_action( "ANY_INPUT" );
@@ -831,6 +837,16 @@ void uilist::query( bool loop, int timeout )
             if( callback != nullptr ) {
                 callback->select( this );
             }
+        } else if( !fentries.empty() && ret_act == "SELECT" ) {
+            std::pair<point, bool> p = ctxt.get_coordinates_text( window );
+            if( p.second ) {
+                uilist_entry *entry = find_entry_by_coordinate( p.first );
+                if( entry != nullptr ) {
+                    if( entry->enabled ) {
+                        ret = entry->retval;
+                    }
+                }
+            }
         } else if( !fentries.empty() && ret_act == "CONFIRM" ) {
             if( entries[ selected ].enabled ) {
                 ret = entries[ selected ].retval; // valid
@@ -861,6 +877,17 @@ void uilist::query( bool loop, int timeout )
     } while( loop && ret == UILIST_WAIT_INPUT );
 }
 
+uilist_entry *uilist::find_entry_by_coordinate( point p )
+{
+    for( int i : fentries ) {
+        uilist_entry &entry = entries[i];
+        if( entry.drawn_info.include_point( p ) ) {
+            return &entry;
+        }
+    }
+    return nullptr;
+}
+
 ///@}
 /**
  * cleanup

src/ui.h

@@ -16,6 +16,7 @@
 #include "pimpl.h"
 #include "point.h"
 #include "string_formatter.h"
+#include "input.h"
 
 class translation;
 
@@ -49,6 +50,20 @@ struct mvwzstr {
     int sym = 0;
 };
 
+struct uilist_entry_drawn_info {
+    int text_x_start;
+    int text_x_end;
+    int y;
+    bool include_point( point p )const {
+        if( text_x_start <= p.x &&
+            p.x <= text_x_end &&
+            y == p.y ) {
+            return true;
+        }
+        return false;
+    }
+};
+
 /**
  * uilist_entry: entry line for uilist
  */
@@ -96,6 +111,8 @@ struct uilist_entry {
     uilist_entry( Enum e, Args && ... args ) :
         uilist_entry( static_cast<int>( e ), std::forward<Args>( args )... )
     {}
+
+    uilist_entry_drawn_info drawn_info;
 };
 
 /**
@@ -338,6 +355,8 @@ class uilist // NOLINT(cata-xy)
 
         bool started = false;
 
+        uilist_entry *find_entry_by_coordinate( point p );
+
     public:
         // Results
         // TODO change to getters
@@ -346,6 +365,7 @@ class uilist // NOLINT(cata-xy)
         int keypress;
 
         int selected;
+
 };
 
 /**