Merge pull request #3 from softmoth/menu_forced_right

renderer: Don't recenter viewport when sidebar changes sizes
thurin · May 12, 2022 · 850c1f1 · 850c1f1
2 parents 21b6c48 + be588af
commit 850c1f1
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 21 deletions.
diff --git a/commands.hpp b/commands.hpp
@@ -47,13 +47,16 @@ command_result multilevel_cmd (color_ostream &out, std::vector <std::string> & p
 
         else if (param0 == "fogcolor" && pcnt >= 4)
         {
-            float c[3];
+            float c[4];
             bool ok = parse_float(parameters[1], c[0]) &&
                       parse_float(parameters[2], c[1]) &&
                       parse_float(parameters[3], c[2]);
 
             if (ok)
+            {
+                c[3] = 0;
                 memcpy(fogcolor, c, sizeof(fogcolor));
+            }
             else
                 return CR_WRONG_USAGE;
         }
@@ -158,7 +161,7 @@ command_result twbt_cmd (color_ostream &out, std::vector <std::string> & paramet
                 r->gdispx++;
                 r->gdispy++;
 
-                r->needs_reshape = true;
+                r->needs_reshape = reshape_all;
             }
             else if (parameters[1] == "smaller")
             {
@@ -167,7 +170,7 @@ command_result twbt_cmd (color_ostream &out, std::vector <std::string> & paramet
                     r->gdispx--;
                     r->gdispy--;
 
-                    r->needs_reshape = true;
+                    r->needs_reshape = reshape_all;
                 }
             }
 
@@ -176,7 +179,7 @@ command_result twbt_cmd (color_ostream &out, std::vector <std::string> & paramet
                 r->gdispx = enabler->fullscreen ? small_map_dispx : large_map_dispx;
                 r->gdispy = enabler->fullscreen ? small_map_dispy : large_map_dispy;
 
-                r->needs_reshape = true;                    
+                r->needs_reshape = reshape_all;                    
             }
 
             else if (parameters[1][0] == '+' || parameters[1][0] == '-')
@@ -188,7 +191,7 @@ command_result twbt_cmd (color_ostream &out, std::vector <std::string> & paramet
                 r->gdispx += delta;
                 r->gdispy += delta;
 
-                r->needs_reshape = true;
+                r->needs_reshape = reshape_all;
             }
 
             else if (pcnt >= 3)
@@ -201,7 +204,7 @@ command_result twbt_cmd (color_ostream &out, std::vector <std::string> & paramet
                 {
                     r->gdispx = w;
                     r->gdispy = h;
-                    r->needs_reshape = true;
+                    r->needs_reshape = reshape_all;
                 }
                 else
                     return CR_WRONG_USAGE;   
@@ -330,4 +333,4 @@ command_result colormap_cmd (color_ostream &out, std::vector <std::string> & par
     }
 
     return CR_OK;    
-}
+}
diff --git a/config.hpp b/config.hpp
@@ -577,7 +577,7 @@ static bool load_overrides()
                 int idx = tilesets.size() - 1;
                 string n = (tokens.size() == 4) ?
                     tokens[3] :
-                    static_cast<std::ostringstream*>(&(std::ostringstream() << idx))->str();
+                    int_to_string(idx);
                 tilesetnames[n] = idx;
             }
 

diff --git a/dwarfmode.hpp b/dwarfmode.hpp
@@ -40,7 +40,7 @@ struct dwarfmode_hook : public df::viewscreen_dwarfmodest
         if (gmenu_w != menu_w_new)
         {
             gmenu_w = menu_w_new;
-            r->needs_reshape = true;
+            r->needs_reshape = reshape_sidebar;
         }
     }
 
@@ -70,7 +70,7 @@ struct dwarfmode_hook : public df::viewscreen_dwarfmodest
         if (gmenu_w < 0)
         {
             gmenu_w = get_menu_width();
-            r->needs_reshape = true;
+            r->needs_reshape = reshape_sidebar;
         }
 
         r->reshape_zoom_swap();

diff --git a/renderer.hpp b/renderer.hpp
@@ -52,12 +52,13 @@ static void write_tile_vertexes(GLfloat x, GLfloat y, GLfloat *vertex, float d)
 
 renderer_cool::renderer_cool()
 {
-    dummy = 'TWBT';
+    dummy = TWBT_MAGIC_IDENT;
     gvertexes = 0, gfg = 0, gtex = 0;
     gdimx = 0, gdimy = 0, gdimxfull = 0, gdimyfull = 0;
     gdispx = 0, gdispy = 0;
     goff_x = 0, goff_y = 0, gsize_x = 0, gsize_y = 0;
-    needs_reshape = needs_zoom = 0;
+    needs_reshape = reshape_none;
+    needs_zoom = 0;
     map_cache = 0;
 }
 
@@ -171,12 +172,16 @@ void renderer_cool::reshape_graphics()
     if (df::viewscreen_dwarfmodest::_identity.is_direct_instance(ws))
         goff_y_gl = goff_y - (gdimy == gdimyfull ? 0 : roundf(gdispy - (gsize_y - gdispy * gdimyfull)));                
 
-    *df::global::window_x = std::max(0, cx - gdimx / 2);
-    *df::global::window_y = std::max(0, cy - gdimy / 2);
+    if (needs_reshape == reshape_all)
+    {
+        *df::global::window_x = std::max(0, cx - gdimx / 2);
+        *df::global::window_y = std::max(0, cy - gdimy / 2);
+    }
 
     int tiles = gdimx * gdimy;
     init_buffers_and_coords(tiles, gdimy + 1);
 
+    needs_reshape = reshape_none;
     needs_full_update = true;
 }
 
@@ -685,11 +690,11 @@ void renderer_cool::reshape_zoom_swap()
     static int game_mode = 3;
     if (game_mode != *df::global::gamemode)
     {
-        needs_reshape = true;
+        needs_reshape = reshape_all;
         game_mode = *df::global::gamemode;
     }
 
-    if (needs_reshape)
+    if (needs_reshape != reshape_none)
     {
         if (needs_zoom)
         {
@@ -709,7 +714,6 @@ void renderer_cool::reshape_zoom_swap()
             needs_zoom = 0;
         }
 
-        needs_reshape = false;
         reshape_graphics();
         gps->force_full_display_count = 1;
         DFHack::Gui::getCurViewscreen()->resize(gps->dimx, gps->dimy);
@@ -752,7 +756,7 @@ void renderer_cool::zoom(df::zoom_commands cmd)
         return;
     }
 
-    needs_reshape = true;
+    needs_reshape = reshape_all;
 }
 
 extern "C" {
@@ -780,4 +784,4 @@ bool renderer_cool::get_mouse_coords(int32_t *x, int32_t *y)
     *y = _y;
 
     return true;
-}
+}
diff --git a/renderer_twbt.h b/renderer_twbt.h
@@ -22,6 +22,15 @@ struct _renderer_opengl : public df::renderer
 };
 typedef _renderer_opengl renderer_opengl; // This is to make Linux happy
 
+const uint32_t TWBT_MAGIC_IDENT = 0x54574254;
+
+enum reshape_status
+{
+    reshape_none,
+    reshape_sidebar,
+    reshape_all,
+};
+
 struct renderer_cool : renderer_opengl
 {
     uint32_t dummy;
@@ -30,7 +39,7 @@ struct renderer_cool : renderer_opengl
     int gdimx, gdimy, gdimxfull, gdimyfull;
     int gdispx, gdispy;
     float goff_x, goff_y, gsize_x, gsize_y;
-    bool needs_reshape;
+    reshape_status needs_reshape;
     int needs_zoom;
     bool needs_full_update;
     unsigned char *gscreen;
@@ -66,7 +75,7 @@ struct renderer_cool : renderer_opengl
     virtual void _last_vmethod() {};
 
     bool is_twbt() {
-        return (this->dummy == 'TWBT');
+        return (this->dummy == TWBT_MAGIC_IDENT);
     };
 
     void output_string(int8_t color, int x, int y, std::string str)

diff --git a/twbt.cpp b/twbt.cpp
@@ -165,6 +165,13 @@ struct tile_overrides {
     bool has_material_overrides = false;
 };
 
+inline string int_to_string(const int n)
+{
+    std::ostringstream ss;
+    ss << n;
+    return ss.str();
+}
+
 static struct tile_overrides *overrides[256];
 
 long *text_texpos, *map_texpos;