Enable mouse input - rework

src/input.h

@@ -634,6 +634,10 @@ class input_context
          */
         input_event get_raw_input();
 
+        /**
+         * Get coordinate of text level from mouse input, difference between this and get_coordinates is that one is getting pixel level coordinate.
+         * Return false if the result is not in the window.
+         */
         std::pair<point, bool> get_coordinates_text( const catacurses::window &capture_win ) const;
 
         /**

src/inventory_ui.cpp

@@ -971,10 +971,9 @@ void inventory_column::draw( const catacurses::window &win, const point &p )
 
         const bool selected = active && is_selected( entry );
 
-        entry.drawn_info.text_x_start = x1;
+        entry.drawn_rect.p_min = point( x1, yy );
         const int hx_max = p.x + get_width() + contained_offset;
-        entry.drawn_info.text_x_end = hx_max;
-        entry.drawn_info.y = yy;
+        entry.drawn_rect.p_max = point( hx_max, yy );
 
         if( selected && visible_cells() > 1 ) {
             for( int hx = x1; hx < hx_max; ++hx ) {
@@ -1424,11 +1423,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_rect.contains( coordinate ) ) {
                 return entry;
             }
         }

src/inventory_ui.h

@@ -24,6 +24,7 @@
 #include "pimpl.h"
 #include "units.h"
 #include "item_category.h"
+#include "ui.h"
 
 class Character;
 class item;
@@ -48,12 +49,6 @@ struct inventory_input;
 using drop_location = std::pair<item_location, int>;
 using drop_locations = std::list<drop_location>;
 
-struct inventory_entry_drawn_info {
-    int text_x_start;
-    int text_x_end;
-    int y;
-};
-
 class inventory_entry
 {
     public:
@@ -129,7 +124,7 @@ class inventory_entry
         nc_color get_invlet_color() const;
         void update_cache();
 
-        inventory_entry_drawn_info drawn_info;
+        inclusive_rectangle drawn_rect;
 
     private:
         const item_category *custom_category = nullptr;

src/pickup.cpp

@@ -623,6 +623,7 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
         ctxt.register_action( "ANY_INPUT" );
         ctxt.register_action( "HELP_KEYBINDINGS" );
         ctxt.register_action( "FILTER" );
+        ctxt.register_action( "SELECT" );
 #if defined(__ANDROID__)
         ctxt.allow_text_entry = true; // allow user to specify pickup amount
 #endif
@@ -669,6 +670,7 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
             const std::string pickup_chars = ctxt.get_available_single_char_hotkeys( all_pickup_chars );
 
             werase( w_pickup );
+            pickup_rect::list.clear();
             for( int cur_it = start; cur_it < start + maxitems; cur_it++ ) {
                 if( cur_it < static_cast<int>( matches.size() ) ) {
                     int true_it = matches[cur_it];
@@ -739,8 +741,12 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
                         item_name = string_format( "<color_light_red>!</color> %s", item_name );
                     }
 
-                    trim_and_print( w_pickup, point( 6, 1 + ( cur_it % maxitems ) ), pickupW - 4, icolor,
+                    int y = 1 + ( cur_it % maxitems );
+                    trim_and_print( w_pickup, point( 6, y ), pickupW - 4, icolor,
                                     item_name );
+                    pickup_rect rect = pickup_rect( point( 6, y ), point( 6 + pickupW - 4, y ) );
+                    rect.cur_it = cur_it;
+                    pickup_rect::list.push_back( rect );
                 }
             }
 
@@ -794,6 +800,15 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from )
                 if( itemcount < 0 ) {
                     itemcount = 0;
                 }
+            } else if( action == "SELECT" ) {
+                std::pair<point, bool> p = ctxt.get_coordinates_text( w_pickup );
+                if( p.second ) {
+                    pickup_rect *rect = pickup_rect::find_by_coordinate( p.first );
+                    selected = rect->cur_it;
+                    iScrollPos = 0;
+                    idx = selected;
+                }
+
             } else if( action == "SCROLL_UP" ) {
                 iScrollPos--;
             } else if( action == "SCROLL_DOWN" ) {
@@ -1082,3 +1097,15 @@ int Pickup::cost_to_move_item( const Character &who, const item &it )
     // Keep it sane - it's not a long activity
     return std::min( 400, ret );
 }
+
+std::vector<Pickup::pickup_rect> Pickup::pickup_rect::list;
+
+Pickup::pickup_rect *Pickup::pickup_rect::find_by_coordinate( point p )
+{
+    for( pickup_rect rect : pickup_rect::list ) {
+        if( rect.contains( p ) ) {
+            return &rect;
+        }
+    }
+    return nullptr;
+}

src/pickup.h

@@ -3,6 +3,8 @@
 #define CATA_SRC_PICKUP_H
 
 #include <vector>
+#include "point.h"
+#include "ui.h"
 
 class item;
 class item_location;
@@ -42,6 +44,14 @@ int cost_to_move_item( const Character &who, const item &it );
  * @param m map they are on
  */
 bool handle_spillable_contents( Character &c, item &it, map &m );
-} // namespace Pickup
 
+struct pickup_rect : inclusive_rectangle {
+    pickup_rect() : inclusive_rectangle() {}
+    pickup_rect( const point &P_MIN, const point &P_MAX ) : inclusive_rectangle( P_MIN, P_MAX ) {}
+    int cur_it;
+    static std::vector<pickup_rect> list;
+    static pickup_rect *find_by_coordinate( point p );
+};
+
+} // namespace Pickup
 #endif // CATA_SRC_PICKUP_H

src/ui.cpp

@@ -613,7 +613,11 @@ 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_rect.p_min = point( x, y );
+                entries[ei].drawn_rect.p_max = point( x + max_entry_len, 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 +794,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 +836,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 +876,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_rect.contains( 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;
 
@@ -96,6 +97,8 @@ struct uilist_entry {
     uilist_entry( Enum e, Args && ... args ) :
         uilist_entry( static_cast<int>( e ), std::forward<Args>( args )... )
     {}
+
+    inclusive_rectangle drawn_rect;
 };
 
 /**
@@ -338,13 +341,14 @@ class uilist // NOLINT(cata-xy)
 
         bool started = false;
 
+        uilist_entry *find_entry_by_coordinate( point p );
+
     public:
         // Results
         // TODO change to getters
         std::string ret_act;
         int ret = 0;
         int keypress = 0;
-
         int selected = 0;
 };