Migrate uilist to ImGui

src/advanced_inv.cpp

@@ -19,6 +19,7 @@
 #include "cached_options.h"
 #include "calendar.h"
 #include "cata_assert.h"
+#include "cata_imgui.h"
 #include "cata_scope_helpers.h"
 #include "catacharset.h"
 #include "character.h"
@@ -27,6 +28,7 @@
 #include "enums.h"
 #include "game.h"
 #include "game_constants.h"
+#include "imgui/imgui.h"
 #include "input.h"
 #include "input_context.h"
 #include "inventory.h"
@@ -2024,8 +2026,11 @@ class query_destination_callback : public uilist_callback
 
 void query_destination_callback::draw_squares( const uilist *menu )
 {
+    ImGui::TableSetColumnIndex( 0 );
+    ImGui::NewLine();
+    ImGui::NewLine();
+    ImGui::NewLine();
     cata_assert( menu->entries.size() >= 9 );
-    int ofs = -25 - 4;
     int sel = 0;
     if( menu->selected >= 0 && static_cast<size_t>( menu->selected ) < menu->entries.size() ) {
         sel = _adv_inv.screen_relative_location(
@@ -2041,12 +2046,20 @@ void query_destination_callback::draw_squares( const uilist *menu )
         bool canputitems = menu->entries[i - 1].enabled && square.canputitems();
         nc_color bcolor = canputitems ? sel == loc ? h_white : c_light_gray : c_red;
         nc_color kcolor = canputitems ? sel == loc ? h_white : c_dark_gray : c_red;
-        const point p( square.hscreen + point( ofs, 5 ) );
-        mvwprintz( menu->window, p, bcolor, "%c", bracket[0] );
-        wprintz( menu->window, kcolor, "%s", key );
-        wprintz( menu->window, bcolor, "%c", bracket[1] );
+        // TODO(db48x): maybe make these clickable buttons or something
+        ImGui::PushID( i );
+        ImGui::BeginGroup();
+        ImGui::TextColored( cataimgui::imvec4_from_color( bcolor ), "%c", bracket[0] );
+        ImGui::SameLine( 0.0, 0.0 );
+        ImGui::TextColored( cataimgui::imvec4_from_color( kcolor ), "%s", key.c_str() );
+        ImGui::SameLine( 0.0, 0.0 );
+        ImGui::TextColored( cataimgui::imvec4_from_color( bcolor ), "%c", bracket[1] );
+        ImGui::EndGroup();
+        ImGui::PopID();
+        if( i % 3 != 0 ) {
+            ImGui::SameLine();
+        }
     }
-    wnoutrefresh( menu->window );
 }
 
 bool advanced_inventory::query_destination( aim_location &def )

src/cata_imgui.cpp

@@ -35,6 +35,22 @@ struct pairs {
 std::array<RGBTuple, color_loader<RGBTuple>::COLOR_NAMES_COUNT> rgbPalette;
 std::array<pairs, 100> colorpairs;   //storage for pair'ed colored
 
+ImVec4 cataimgui::imvec4_from_color( nc_color color )
+{
+    int pair_id = color.get_index();
+    pairs &pair = colorpairs[pair_id];
+
+    int palette_index = pair.FG != 0 ? pair.FG : pair.BG;
+    if( color.is_bold() ) {
+        palette_index += color_loader<RGBTuple>::COLOR_NAMES_COUNT / 2;
+    }
+    RGBTuple &rgbCol = rgbPalette[palette_index];
+    return { static_cast<float>( rgbCol.Red / 255. ),
+             static_cast<float>( rgbCol.Green / 255. ),
+             static_cast<float>( rgbCol.Blue / 255. ),
+             static_cast<float>( 255. ) };
+}
+
 ImTui::TScreen *imtui_screen = nullptr;
 std::vector<std::pair<int, ImTui::mouse_event>> imtui_events;
 
@@ -168,6 +184,15 @@ RGBTuple color_loader<RGBTuple>::from_rgb( const int r, const int g, const int b
 #include <imgui/imgui_impl_sdl2.h>
 #include <imgui/imgui_impl_sdlrenderer2.h>
 
+ImVec4 cataimgui::imvec4_from_color( nc_color &color )
+{
+    SDL_Color c = curses_color_to_SDL( color );
+    return { static_cast<float>( c.r / 255. ),
+             static_cast<float>( c.g / 255. ),
+             static_cast<float>( c.b / 255. ),
+             static_cast<float>( c.a / 255. ) };
+}
+
 struct CataImFont : public ImFont {
     std::unordered_map<ImU32, unsigned char> sdlColorsToCata;
     const cataimgui::client &imclient;
@@ -348,29 +373,21 @@ void cataimgui::imvec2_to_point( ImVec2 *src, point *dest )
     }
 }
 
-void cataimgui::window::draw_colored_text( std::string const &text, const nc_color &color,
-        float wrap_width, bool *is_selected, bool *is_focused, bool *is_hovered )
+void cataimgui::draw_colored_text( std::string const &text,
+                                   __attribute__( ( unused ) ) const nc_color &color, bool *is_selected, bool *is_focused,
+                                   bool *is_hovered )
 {
     nc_color color_cpy = color;
-    draw_colored_text( text, color_cpy, wrap_width, is_selected, is_focused, is_hovered );
+    draw_colored_text( text, color_cpy, is_selected, is_focused, is_hovered );
 }
 
-void cataimgui::window::draw_colored_text( std::string const &text, nc_color &color,
-        float wrap_width, bool *is_selected, bool *is_focused, bool *is_hovered )
+void cataimgui::draw_colored_text( std::string const &text,
+                                   __attribute__( ( unused ) ) nc_color &color, bool *is_selected, bool *is_focused, bool *is_hovered )
 {
     ImGui::PushID( text.c_str() );
+    ImGui::PushTextWrapPos( 0 );
     ImGuiID itemId = GImGui->CurrentWindow->IDStack.back();
-    std::stack<nc_color> color_stack;
-    color_stack.push( color );
-    size_t chars_per_line = size_t( wrap_width );
-    if( chars_per_line == 0 ) {
-        chars_per_line = SIZE_MAX;
-    }
-#if defined(WIN32) || defined(TILES)
-    size_t char_width = size_t( ImGui::CalcTextSize( " " ).x );
-    chars_per_line /= char_width;
-#endif
-    std::vector<std::string> folded_msg = foldstring( text, chars_per_line );
+    std::vector<std::string> folded_msg = foldstring( text, -1 );
 
     for( const std::string &line : folded_msg ) {
 
@@ -387,45 +404,27 @@ void cataimgui::window::draw_colored_text( std::string const &text, nc_color &co
 
             if( seg[0] == '<' ) {
                 const color_tag_parse_result::tag_type type =
-                    update_color_stack( color_stack, seg, report_color_error::yes );
+                    update_imgui_color_stack( seg, report_color_error::yes );
                 if( type != color_tag_parse_result::non_color_tag ) {
                     seg = rm_prefix( seg );
                 }
             }
 
-            color = color_stack.empty() ? color : color_stack.top();
             if( i++ != 0 ) {
                 ImGui::SameLine( 0, 0 );
             }
-#if !(defined(TILES) || defined(WIN32))
-            int pair_id = color.get_index();
-            pairs &pair = colorpairs[pair_id];
-
-            int palette_index = pair.FG != 0 ? pair.FG : pair.BG;
-            if( color.is_bold() ) {
-                palette_index += color_loader<RGBTuple>::COLOR_NAMES_COUNT / 2;
-            }
-            RGBTuple &rgbCol = rgbPalette[palette_index];
-            ImGui::TextColored( { static_cast<float>( rgbCol.Red / 255. ), static_cast<float>( rgbCol.Green / 255. ),
-                                  static_cast<float>( rgbCol.Blue / 255. ), static_cast<float>( 255. ) },
-                                "%s", seg.c_str() );
-#else
-            SDL_Color c = curses_color_to_SDL( color );
-            ImGui::TextColored( { static_cast<float>( c.r / 255. ), static_cast<float>( c.g / 255. ),
-                                  static_cast<float>( c.b / 255. ), static_cast<float>( c.a / 255. ) },
-                                "%s", seg.c_str() );
-#endif
+            ImGui::TextUnformatted( seg.c_str() );
             GImGui->LastItemData.ID = itemId;
             if( is_focused && !*is_focused ) {
                 *is_focused = ImGui::IsItemFocused();
             }
             if( is_hovered && !*is_hovered ) {
                 *is_hovered = GImGui->HoveredId == itemId;
             }
-
         }
     }
 
+    ImGui::PopTextWrapPos();
     ImGui::PopID();
 }
 
@@ -476,7 +475,8 @@ cataimgui::window::window( int window_flags )
 
     this->window_flags = window_flags | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize |
                          ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNavFocus |
-                         ImGuiWindowFlags_NoBringToFrontOnFocus;
+                         ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollbar |
+                         ImGuiWindowFlags_NoScrollWithMouse;
 }
 
 cataimgui::window::window( const std::string &id_, int window_flags ) : window( window_flags )

src/cata_imgui.h

@@ -17,11 +17,14 @@ struct item_info_data;
 
 struct point;
 class ImVec2;
+class ImVec4;
 class Font;
 class input_context;
 
 namespace cataimgui
 {
+ImVec4 imvec4_from_color( nc_color &color );
+
 struct bounds {
     float x;
     float y;
@@ -76,6 +79,11 @@ class client
 void point_to_imvec2( point *src, ImVec2 *dest );
 void imvec2_to_point( ImVec2 *src, point *dest );
 
+void draw_colored_text( std::string const &text, const nc_color &color, bool *is_selected = nullptr,
+                        bool *is_focused = nullptr, bool *is_hovered = nullptr );
+void draw_colored_text( std::string const &text, nc_color &color, bool *is_selected = nullptr,
+                        bool *is_focused = nullptr, bool *is_hovered = nullptr );
+
 class window
 {
         std::unique_ptr<class window_impl> p_impl;
@@ -86,12 +94,6 @@ class window
     public:
         explicit window( const std::string &id_, int window_flags = 0 );
         virtual ~window();
-        void draw_colored_text( std::string const &text, const nc_color &color,
-                                float wrap_width = 0.0F, bool *is_selected = nullptr,
-                                bool *is_focused = nullptr, bool *is_hovered = nullptr );
-        void draw_colored_text( std::string const &text, nc_color &color,
-                                float wrap_width = 0.0F, bool *is_selected = nullptr,
-                                bool *is_focused = nullptr, bool *is_hovered = nullptr );
         bool action_button( const std::string &action, const std::string &text );
         bool has_button_action();
         std::string get_button_action();

src/editmap.cpp

@@ -1282,7 +1282,7 @@ void editmap::edit_fld()
             const field_type &ftype = idx.obj();
             int fsel_intensity = field_intensity;
             if( fmenu.ret > 0 ) {
-                shared_ptr_fast<ui_adaptor> fmenu_ui = fmenu.create_or_get_ui_adaptor();
+                shared_ptr_fast<uilist_impl> fmenu_ui = fmenu.create_or_get_ui();
 
                 uilist femenu;
                 femenu.w_width_setup = width;
@@ -1421,7 +1421,7 @@ void editmap::edit_itm()
     restore_on_out_of_scope<std::string> info_txt_prev( info_txt_curr );
     restore_on_out_of_scope<std::string> info_title_prev( info_title_curr );
 
-    shared_ptr_fast<ui_adaptor> ilmenu_ui = ilmenu.create_or_get_ui_adaptor();
+    shared_ptr_fast<uilist_impl> ilmenu_ui = ilmenu.create_or_get_ui();
 
     do {
         info_txt_curr.clear();
@@ -1463,7 +1463,7 @@ void editmap::edit_itm()
             };
             imenu.allow_additional = true;
 
-            shared_ptr_fast<ui_adaptor> imenu_ui = imenu.create_or_get_ui_adaptor();
+            shared_ptr_fast<uilist_impl> imenu_ui = imenu.create_or_get_ui();
 
             do {
                 imenu.query();
@@ -1848,7 +1848,7 @@ void editmap::mapgen_preview( const real_coords &tc, uilist &gmenu )
 
     gmenu.border_color = c_light_gray;
     gmenu.hilight_color = c_black_white;
-    gmenu.create_or_get_ui_adaptor()->invalidate_ui();
+    //gmenu.create_or_get_ui_adaptor()->invalidate_ui();
 
     uilist gpmenu;
     gpmenu.w_width_setup = width;
@@ -1976,10 +1976,10 @@ void editmap::mapgen_preview( const real_coords &tc, uilist &gmenu )
         } else if( gpmenu.ret == UILIST_ADDITIONAL ) {
             if( gpmenu.ret_act == "LEFT" ) {
                 gmenu.scrollby( -1 );
-                gmenu.create_or_get_ui_adaptor()->invalidate_ui();
+                //gmenu.create_or_get_ui_adaptor()->invalidate_ui();
             } else if( gpmenu.ret_act == "RIGHT" ) {
                 gmenu.scrollby( 1 );
-                gmenu.create_or_get_ui_adaptor()->invalidate_ui();
+                //gmenu.create_or_get_ui_adaptor()->invalidate_ui();
             }
         }
         showpreview = gpmenu.ret == UILIST_TIMEOUT ? !showpreview : true;
@@ -1991,7 +1991,7 @@ void editmap::mapgen_preview( const real_coords &tc, uilist &gmenu )
     }
     gmenu.border_color = c_magenta;
     gmenu.hilight_color = h_white;
-    gmenu.create_or_get_ui_adaptor()->invalidate_ui();
+    //gmenu.create_or_get_ui_adaptor()->invalidate_ui();
     hilights["mapgentgt"].points.clear();
     cleartmpmap( tmpmap );
 }
@@ -2191,7 +2191,7 @@ void editmap::edit_mapgen()
 
         if( gmenu.ret >= 0 ) {
             blink = false;
-            shared_ptr_fast<ui_adaptor> gmenu_ui = gmenu.create_or_get_ui_adaptor();
+            shared_ptr_fast<uilist_impl> gmenu_ui = gmenu.create_or_get_ui();
             mapgen_preview( tc, gmenu );
             blink = true;
         } else if( gmenu.ret == UILIST_ADDITIONAL ) {

src/input_context.cpp

@@ -682,7 +682,7 @@ void keybindings_ui::draw_controls()
     scroll_offset = SIZE_MAX;
     size_t legend_idx = 0;
     for( ; legend_idx < 4; legend_idx++ ) {
-        draw_colored_text( legend[legend_idx], c_white );
+        cataimgui::draw_colored_text( legend[legend_idx], c_white );
         ImGui::SameLine();
         std::string button_text_no_color = remove_color_tags( buttons[legend_idx].second );
         ImGui::SetCursorPosX( str_width_to_pixels( width ) - ( get_text_width(
@@ -693,7 +693,7 @@ void keybindings_ui::draw_controls()
         ImGui::EndDisabled();
     }
     for( ; legend_idx < legend.size(); legend_idx++ ) {
-        draw_colored_text( legend[legend_idx], c_white );
+        cataimgui::draw_colored_text( legend[legend_idx], c_white );
     }
     draw_filter( *ctxt, status == kb_menu_status::filter );
     if( last_status != status && status == kb_menu_status::filter ) {
@@ -769,8 +769,9 @@ void keybindings_ui::draw_controls()
             key_text += string_format( "%s:", ctxt->get_action_name( action_id ) );
             bool is_selected = false;
             bool is_hovered = false;
-            draw_colored_text( key_text, col, 0.0f, status == kb_menu_status::show ? nullptr : &is_selected,
-                               nullptr, &is_hovered );
+            cataimgui::draw_colored_text( key_text, col,
+                                          status == kb_menu_status::show ? nullptr : &is_selected,
+                                          nullptr, &is_hovered );
             if( ( is_selected || is_hovered ) && invlet != ' ' ) {
                 highlight_row_index = i;
             }