Memory override #3

README.md

@@ -30,13 +30,34 @@ The Immediate Mode GUI paradigm may at first appear unusual to some users. This
 - [Jari Komppa's tutorial on building an ImGui library](http://iki.fi/sol/imgui/).
 - [Casey Muratori's original video that popularized the concept](https://mollyrocket.com/861).
 
+Frequently Asked Question
+-------------------------
+<b>How do you use ImGui on a platform that may not have a mouse and keyboard?</b>
+
+I recommend using [Synergy](http://synergy-project.org) and the uSynergy.c micro client to share your mouse and keyboard. This way you can seemingly use your PC input devices on a video game console or a tablet. ImGui was also designed to function with touch inputs if you increase the padding of widgets to compensate for the lack of precision of touch devices, but it is recommended you use a mouse to allow optimising for screen real-estate.
+
+<b>I integrated ImGui in my engine and the text or lines are blurry..</b>
+
+- Try adjusting ImGui::GetIO().PixelCenterOffset to 0.0f or 0.5f.
+- In your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f).
+
+<b>Can you create elaborate/serious tools with ImGui?</b>
+
+Yes. I have written data browsers, debuggers, profilers and all sort of non-trivial tools with the library. There's no reason you cannot, and in my experience the simplicity of the API is very empowering. However note that ImGui is programmer centric and the immediate-mode GUI paradigm might requires a bit of adaptation before you can realize its full potential. 
+
+<b>Can you reskin the look of ImGui?</b>
+
+Yes, you can alter the look of the interface to some degree: changing colors, sizes and padding, font. However, as ImGui is designed and optimised to create debug tools, the amount of skinning you can apply is limited. There is only so much you can stray away from the default look and feel of the interface. The example below uses modified settings to create a more compact UI with different colors:
+
+![skinning screenshot 1](/web/skinning_sample_01.png?raw=true)
+
 
 Credits
 -------
 
 Developed by [Omar Cornut](http://www.miracleworld.net). The library was developed with the support of [Media Molecule](http://www.mediamolecule.com) and first used internally on the game [Tearaway](http://tearaway.mediamolecule.com). 
 
-Embeds [proggy_clean](http://www.proggyfonts.net/) font by Tristan Grimmer (also MIT license).
+Embeds [proggy_clean](http://upperbounds.net) font by Tristan Grimmer (also MIT license).
 
 Inspiration, feedback, and testing: Casey Muratori, Atman Binstock, Mikko Mononen, Emmanuel Briney, Stefan Kamoda, Anton Mikhailov, Matt Willis. Thanks!
 

examples/directx9_example/main.cpp

@@ -20,7 +20,10 @@ struct CUSTOMVERTEX
 };
 #define D3DFVF_CUSTOMVERTEX (D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1)
 
-// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structuer)
+// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structure)
+// If text or lines are blurry when integrating ImGui in your engine:
+// - in your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f)
+// - try adjusting ImGui::GetIO().PixelCenterOffset to 0.5f or 0.375f
 static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count)
 {
     size_t total_vtx_count = 0;
@@ -79,7 +82,7 @@ static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_c
     D3DXMatrixIdentity(&mat);
     g_pd3dDevice->SetTransform(D3DTS_WORLD, &mat);
     g_pd3dDevice->SetTransform(D3DTS_VIEW, &mat);
-	D3DXMatrixOrthoOffCenterLH(&mat, 0.0f, ImGui::GetIO().DisplaySize.x, ImGui::GetIO().DisplaySize.y, 0.0f, -1.0f, +1.0f);
+    D3DXMatrixOrthoOffCenterLH(&mat, 0.5f, ImGui::GetIO().DisplaySize.x+0.5f, ImGui::GetIO().DisplaySize.y+0.5f, 0.5f, -1.0f, +1.0f);
     g_pd3dDevice->SetTransform(D3DTS_PROJECTION, &mat);
 
     // Render command lists

examples/opengl_example/main.cpp

@@ -11,14 +11,17 @@
 static GLFWwindow* window;
 static GLuint fontTex;
 
-// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structuer)
+// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structure)
-// We are using the fixed pipeline. 
+// If text or lines are blurry when integrating ImGui in your engine:
-// A faster way would be to collate all vertices from all cmd_lists into a single vertex buffer
+// - in your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f)
+// - try adjusting ImGui::GetIO().PixelCenterOffset to 0.5f or 0.375f
 static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count)
 {
     if (cmd_lists_count == 0)
         return;
 
+    // We are using the OpenGL fixed pipeline to make the example code simpler to read!
+    // A probable faster way to render would be to collate all vertices from all cmd_lists into a single vertex buffer.
     // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, vertex/texcoord/color pointers.
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -61,6 +64,9 @@ static void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_c
         }
     }
     glDisable(GL_SCISSOR_TEST);
+    glDisableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_VERTEX_ARRAY);
 }
 
 static const char* ImImpl_GetClipboardTextFn()
@@ -145,7 +151,7 @@ void InitImGui()
     ImGuiIO& io = ImGui::GetIO();
     io.DisplaySize = ImVec2((float)w, (float)h);        // Display size, in pixels. For clamping windows positions.
     io.DeltaTime = 1.0f/60.0f;                          // Time elapsed since last frame, in seconds (in this sample app we'll override this every frame because our timestep is variable)
-	io.PixelCenterOffset = 0.5f;                            // Align OpenGL texels
+    io.PixelCenterOffset = 0.0f;                        // Align OpenGL texels
     io.KeyMap[ImGuiKey_Tab] = GLFW_KEY_TAB;             // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array.
     io.KeyMap[ImGuiKey_LeftArrow] = GLFW_KEY_LEFT;
     io.KeyMap[ImGuiKey_RightArrow] = GLFW_KEY_RIGHT;

extra_fonts/README.txt

@@ -0,0 +1,71 @@
+
+Extra fonts for ImGui.
+THOSE FONTS ARE OPTIONAL.
+
+ImGui embeds a copy of 'proggy_clean' that you can use without any external files.
+Export your own font with bmfont (www.angelcode.com/products/bmfont).
+
+bmfont reads fonts (.ttf, .fon, etc.) and output a .fnt file and a texture file, e.g:
+
+  proggy_clean.fon --> [bmfont] ---> proggy_clean_13.fnt
+                                     proggy_clean_13.png
+
+Configure bmfont:
+
+  - Export .fnt as Binary
+  - Tip: uncheck "Render from TrueType outline" and "Font Smoothing" for best result with non-anti-aliased type fonts. 
+    But you can experiment with other settings if you want anti-aliased fonts.
+
+
+(A) Use font data embedded in ImGui
+
+    // Access embedded font data
+    const void* fnt_data;   // pointer to FNT data
+    unsigned fnt_size;      // size of FNT data
+    const void* png_data;   // pointer to PNG data
+    unsigned int png_size;  // size of PNG data
+    ImGui::GetDefaultFontData(&fnt_data, &fnt_size, &png_data, &png_size);
+
+  1. Load the .FNT data from 'fnt_data' (NB: this is done for you by default if you don't do anything)
+
+    ImGuiIO& io = ImGui::GetIO();
+    io.Font = new ImBitmapFont();
+    io.Font->LoadFromMemory(fnt_data, fnt_size);
+    
+  2. Load the .PNG data from 'png_data' into a texture
+
+
+
+(B) Use fonts from external files
+
+    ImGuiIO& io = ImGui::GetIO();
+
+  1. Load the .FNT data, e.g.
+    
+    // proggy_clean_13 [default]
+    io.Font->LoadFromFile("proggy_clean_13.fnt");
+    io.FontTexUvForWhite = ImVec2(0.0f/256.0f,0.0f/128);
+    io.FontYOffset = +1;
+
+    // proggy_small_12
+    io.Font = new ImBitmapFont();
+    io.Font->LoadFromFile("proggy_small_12.fnt");
+    io.FontTexUvForWhite = ImVec2(84.0f/256.0f,20.0f/64);
+    io.FontYOffset = +2;
+    
+    // proggy_small_14
+    io.Font = new ImBitmapFont();
+    io.Font->LoadFromFile("proggy_small_14.fnt");
+    io.FontTexUvForWhite = ImVec2(84.0f/256.0f,20.0f/64);
+    io.FontYOffset = +3;
+    
+    // courier_new_16
+    io.Font->LoadFromFile("courier_new_16.fnt");
+    io.FontTexUvForWhite = ImVec2(1.0f/256.0f,4.0f/128);
+    
+    // courier_new_18
+    io.Font->LoadFromFile("courier_new_18.fnt");
+    io.FontTexUvForWhite = ImVec2(4.0f/256.0f,5.0f/256);
+
+  2. Load the matching .PNG data into a texture
+

imconfig.h

@@ -4,6 +4,18 @@
 
 #pragma once
 
+//---- Define your own malloc/free/realloc functions if you want to override internal memory allocations for ImGui
+/*
+ #define IM_MALLOC(_SIZE) MyMalloc(_SIZE)
+ #define IM_FREE(_PTR) MyFree(_PTR)
+ #define IM_REALLOC(_PTR, _SIZE) MyRealloc(_PTR, _SIZE)
+
+ #include <stdlib.h>    // size_t
+ void* MyMalloc(size_t size);
+ void MyFree(void *ptr);
+ void* MyRealloc(void *ptr, size_t size);
+*/
+
 //---- Define your own ImVector<> type if you don't want to use the provided implementation defined in imgui.h
 //#include <vector>
 //#define ImVector  std::vector
@@ -15,10 +27,6 @@
 //---- Don't implement default clipboard handlers for Windows (so as not to link with OpenClipboard(), etc.)
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS
 
-//---- If you are loading a custom font, ImGui expect to find a pure white pixel at (0,0)
-// Change it's UV coordinate here if you can't have a white pixel at (0,0)
-//#define IMGUI_FONT_TEX_UV_FOR_WHITE	ImVec2(0.f/256.f,0.f/256.f)
-
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
 /*
 #define IM_VEC2_CLASS_EXTRA                                                 \
@@ -40,24 +48,3 @@ namespace ImGui
 };
 */
 
-//---- Define malloc/free/realloc functions to override internal memory allocations for ImGui
-/*
- * #define IM_MALLOC imgui_malloc
- * #define IM_FREE imgui_free
- * #define IM_REALLOC imgui_realloc
- *
- * void* imgui_malloc(size_t size);
- * void imgui_free(void *ptr);
- * void* imgui_realloc(void *ptr, size_t size);
- */
-#ifndef IM_MALLOC
-  #define IM_MALLOC malloc
-#endif
-
-#ifndef IM_FREE
-  #define IM_FREE free
-#endif
-
-#ifndef IM_REALLOC
-  #define IM_REALLOC realloc
-#endif

imgui.h

@@ -18,7 +18,18 @@ struct ImGuiWindow;
 #include <float.h>          // FLT_MAX
 #include <stdarg.h>         // va_list
 #include <stdlib.h>         // NULL
-#include <string.h>
+
+#ifndef IM_MALLOC
+#define IM_MALLOC(_SIZE) malloc((_SIZE))
+#endif
+
+#ifndef IM_FREE
+#define IM_FREE(_PTR) free((_PTR))
+#endif
+
+#ifndef IM_REALLOC
+#define IM_REALLOC(_PTR, _SIZE) realloc((_PTR), (_SIZE))
+#endif
 
 #ifndef IM_ASSERT
 #include <assert.h>
@@ -109,7 +120,7 @@ public:
 
 // Helpers at bottom of the file:
 // - if (IMGUI_ONCE_UPON_A_FRAME)       // Execute a block of code once per frame only
-// - struct ImGuiTextFilter				// Parse and apply text filter. In format "aaaaa[,bbbb][,ccccc]"
+// - struct ImGuiTextFilter             // Parse and apply text filters. In format "aaaaa[,bbbb][,ccccc]"
 // - struct ImGuiTextBuffer             // Text buffer for logging/accumulating text
 // - struct ImGuiStorage                // Custom key value storage (if you need to alter open/close states manually)
 // - struct ImDrawList                  // Draw command list
@@ -168,8 +179,11 @@ namespace ImGui
     float       GetColumnOffset(int column_index = -1);
     void        SetColumnOffset(int column_index, float offset);
     float       GetColumnWidth(int column_index = -1);
-	ImVec2		GetCursorPos();														// cursor position is relative to window position
+    ImVec2      GetCursorPos();                                                     // cursor position relative to window position
     void        SetCursorPos(const ImVec2& pos);                                    // "
+    void        SetCursorPosX(float x);                                             // "
+    void        SetCursorPosY(float y);                                             // "
+    ImVec2      GetCursorScreenPos();												// cursor position in screen space
     void        AlignFirstTextHeightToWidgets();                                    // call once if the first item on the line is a Text() item and you want to vertically lower it to match higher widgets.
     float       GetTextLineSpacing();
     float       GetTextLineHeight();
@@ -198,8 +212,8 @@ namespace ImGui
     bool        SliderInt(const char* label, int* v, int v_min, int v_max, const char* display_format = "%.0f");
     void        PlotLines(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0,0), size_t stride = sizeof(float));
     void        PlotHistogram(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0,0), size_t stride = sizeof(float));
-	void		Checkbox(const char* label, bool* v);
+    bool        Checkbox(const char* label, bool* v);
-	void		CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
+    bool        CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value);
     bool        RadioButton(const char* label, bool active);
     bool        RadioButton(const char* label, int* v, int v_button);
     bool        InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, int decimal_precision = -1);
@@ -253,6 +267,7 @@ namespace ImGui
     int         GetFrameCount();
     const char* GetStyleColorName(ImGuiCol idx);
     void        GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size);
+    ImVec2      CalcTextSize(const char* text, const char* text_end = NULL, const bool hide_text_after_hash = true);
 
 }; // namespace ImGui
 
@@ -355,21 +370,21 @@ enum ImGuiColorEditMode_
     ImGuiColorEditMode_HEX = 2,
 };
 
-// See constructor for comments of individual fields.
 struct ImGuiStyle
 {
-	ImVec2		WindowPadding;
+    float       Alpha;                      // Global alpha applies to everything in ImGui
-	ImVec2		WindowMinSize;
+    ImVec2      WindowPadding;              // Padding within a window
-	ImVec2		FramePadding;
+    ImVec2      WindowMinSize;              // Minimum window size
-	ImVec2		ItemSpacing;
+    ImVec2      FramePadding;               // Padding within a framed rectangle (used by most widgets)
-	ImVec2		ItemInnerSpacing;
+    ImVec2      ItemSpacing;                // Horizontal and vertical spacing between widgets/lines
-	ImVec2		TouchExtraPadding;
+    ImVec2      ItemInnerSpacing;           // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label)
-	ImVec2		AutoFitPadding;
+    ImVec2      TouchExtraPadding;          // Expand bounding box for touch-based system where touch position is not accurate enough (unnecessary for mouse inputs). Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget running. So dont grow this too much!
-	float		WindowFillAlphaDefault;
+    ImVec2      AutoFitPadding;             // Extra space after auto-fit (double-clicking on resize grip)
-	float		WindowRounding;
+    float       WindowFillAlphaDefault;     // Default alpha of window background, if not specified in ImGui::Begin()
-	float		TreeNodeSpacing;
+    float       WindowRounding;             // Radius of window corners rounding. Set to 0.0f to have rectangular windows
-	float		ColumnsMinSpacing;
+    float       TreeNodeSpacing;            // Horizontal spacing when entering a tree node
-	float		ScrollBarWidth;
+    float       ColumnsMinSpacing;          // Minimum horizontal spacing between two columns
+    float       ScrollBarWidth;             // Width of the vertical scroll bar
     ImVec4      Colors[ImGuiCol_COUNT];
 
     ImGuiStyle();
@@ -389,9 +404,10 @@ struct ImGuiIO
     float       MouseDoubleClickMaxDist;    // = 6.0f                   // Distance threshold to stay in to validate a double-click, in pixels.
     int         KeyMap[ImGuiKey_COUNT];     // <unset>                  // Map of indices into the KeysDown[512] entries array
     ImFont      Font;                       // <auto>                   // Gets passed to text functions. Typedef ImFont to the type you want (ImBitmapFont* or your own font).
-	float		FontHeight;					// <auto>					// Default font height, must be the vertical distance between two lines of text, aka == CalcTextSize(" ").y
+	float		FontYOffset;				// = 0.0f					// Offset font rendering by xx pixels in Y axis.
+    ImVec2      FontTexUvForWhite;          // = (0.0f,0.0f)            // Font texture must have a white pixel at this UV coordinate. Adjust if you are using custom texture.
     bool        FontAllowScaling;           // = false                  // Set to allow scaling text with CTRL+Wheel.
-	float		PixelCenterOffset;			// = 0.5f					// Set to 0.0f for DirectX <= 9, 0.5f for Direct3D >= 10 and OpenGL.
+    float       PixelCenterOffset;          // = 0.0f                   // Try to set to 0.5f or 0.375f if rendering is blurry
 
     // Settings - Rendering function (REQUIRED)
     // See example code if you are unsure of how to implement this.
@@ -449,7 +465,7 @@ private:
     bool        TryIsNewFrame() const   { const int current_frame = ImGui::GetFrameCount(); if (LastFrame == current_frame) return false; LastFrame = current_frame; return true; }
 };
 
-// Helper: Parse and apply text filter. In format "aaaaa[,bbbb][,ccccc]"
+// Helper: Parse and apply text filters. In format "aaaaa[,bbbb][,ccccc]"
 struct ImGuiTextFilter
 {
     struct TextRange 
@@ -463,7 +479,7 @@ struct ImGuiTextFilter
         const char* end() const { return e; }
         bool empty() const { return b == e; }
         char front() const { return *b; }
-		static bool isblank(char c) { return c == ' ' && c == '\t'; } 
+        static bool isblank(char c) { return c == ' ' || c == '\t'; } 
         void trim_blanks() { while (b < e && isblank(*b)) b++; while (e > b && isblank(*(e-1))) e--; }
         void split(char separator, ImVector<TextRange>& out);
     };
@@ -524,10 +540,6 @@ struct ImDrawCmd
     ImVec4          clip_rect;
 };
 
-#ifndef IMGUI_FONT_TEX_UV_FOR_WHITE
-#define IMGUI_FONT_TEX_UV_FOR_WHITE	ImVec2(0.f,0.f)
-#endif
-
 // sizeof() == 20
 struct ImDrawVert
 {
@@ -622,7 +634,7 @@ struct ImBitmapFont
 #pragma pack(pop)
 
     unsigned char*          Data;               // Raw data, content of .fnt file
-	int						DataSize;			//
+    size_t                  DataSize;           //
     bool                    DataOwned;          // 
     const FntInfo*          Info;               // (point into raw data)
     const FntCommon*        Common;             // (point into raw data)
@@ -637,12 +649,13 @@ struct ImBitmapFont
     ImBitmapFont();
     ~ImBitmapFont() { Clear(); }
 
-	bool					LoadFromMemory(const void* data, int data_size);
+    bool                    LoadFromMemory(const void* data, size_t data_size);
     bool                    LoadFromFile(const char* filename);
     void                    Clear();
     void                    BuildLookupTable();
     const FntGlyph *        FindGlyph(unsigned short c) const;
     float                   GetFontSize() const { return (float)Info->FontSize; }
+	bool					IsLoaded() const { return Info != NULL && Common != NULL && Glyphs != NULL; }
 
     ImVec2                  CalcTextSize(float size, float max_width, const char* text_begin, const char* text_end, const char** remaining = NULL) const;
     void                    RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, ImDrawVert*& out_vertices) const;

stb_textedit.h

@@ -1,4 +1,4 @@
-// stb_textedit.h - v1.3  - public domain - Sean Barrett
+// stb_textedit.h - v1.4  - public domain - Sean Barrett
 // Development of this library was sponsored by RAD Game Tools
 //
 // This C header file implements the guts of a multi-line text-editing
@@ -30,8 +30,9 @@
 //
 // VERSION HISTORY
 //
-//   1.3  (2013-06-19) fix mouse clicking to round to nearest char boundary
+//   1.4  (2014-08-17) fix signed/unsigned warnings
-//   1.2  (2013-05-27) fix some RAD types that had crept into the new code
+//   1.3  (2014-06-19) fix mouse clicking to round to nearest char boundary
+//   1.2  (2014-05-27) fix some RAD types that had crept into the new code
 //   1.1  (2013-12-15) move-by-word (requires STB_TEXTEDIT_IS_SPACE )
 //   1.0  (2012-07-26) improve documentation, initial public release
 //   0.3  (2012-02-24) bugfixes, single-line mode; insert mode
@@ -41,7 +42,7 @@
 // ADDITIONAL CONTRIBUTORS
 //
 //   Ulf Winklemann: move-by-word in 1.1
-//   Scott Graham: mouse selectiom bugfix in 1.3
+//   Scott Graham: mouse selection bugfix in 1.3
 //
 // USAGE
 //
@@ -445,7 +446,7 @@ static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state
 static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state);
 static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state);
 static void stb_text_makeundo_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length);
-static void stb_text_makeundo_insert(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length);
+static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int length);
 static void stb_text_makeundo_replace(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length);
 
 typedef struct
@@ -649,7 +650,7 @@ static int stb_textedit_paste(STB_TEXTEDIT_STRING *str, STB_TexteditState *state
    stb_textedit_delete_selection(str,state);
    // try to insert the characters
    if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, len)) {
-      stb_text_makeundo_insert(str, state, state->cursor, len);
+      stb_text_makeundo_insert(state, state->cursor, len);
       state->cursor += len;
       state->has_preferred_x = 0;
       return 1;
@@ -684,7 +685,7 @@ retry:
             } else {
                stb_textedit_delete_selection(str,state); // implicity clamps
                if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) {
-                  stb_text_makeundo_insert(str, state, state->cursor, 1);
+                  stb_text_makeundo_insert(state, state->cursor, 1);
                   ++state->cursor;
                   state->has_preferred_x = 0;
                }
@@ -1007,13 +1008,13 @@ static void stb_textedit_discard_undo(StbUndoState *state)
          int n = state->undo_rec[0].insert_length, i;
          // delete n characters from all other records
          state->undo_char_point = state->undo_char_point - (short) n;  // vsnet05
-         memmove(state->undo_char, state->undo_char + n, state->undo_char_point*sizeof(STB_TEXTEDIT_CHARTYPE));
+         memmove(state->undo_char, state->undo_char + n, (size_t) (state->undo_char_point*sizeof(STB_TEXTEDIT_CHARTYPE)));
          for (i=0; i < state->undo_point; ++i)
             if (state->undo_rec[i].char_storage >= 0)
                state->undo_rec[i].char_storage = state->undo_rec[i].char_storage - (short) n; // vsnet05 // @OPTIMIZE: get rid of char_storage and infer it
       }
       --state->undo_point;
-      memmove(state->undo_rec, state->undo_rec+1, state->undo_point*sizeof(state->undo_rec[0]));
+      memmove(state->undo_rec, state->undo_rec+1, (size_t) (state->undo_point*sizeof(state->undo_rec[0])));
    }
 }
 
@@ -1031,13 +1032,13 @@ static void stb_textedit_discard_redo(StbUndoState *state)
          int n = state->undo_rec[k].insert_length, i;
          // delete n characters from all other records
          state->redo_char_point = state->redo_char_point + (short) n; // vsnet05
-         memmove(state->undo_char + state->redo_char_point, state->undo_char + state->redo_char_point-n, (STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_char_point)*sizeof(STB_TEXTEDIT_CHARTYPE));
+         memmove(state->undo_char + state->redo_char_point, state->undo_char + state->redo_char_point-n, (size_t) ((STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_char_point)*sizeof(STB_TEXTEDIT_CHARTYPE)));
          for (i=state->redo_point; i < k; ++i)
             if (state->undo_rec[i].char_storage >= 0)
                state->undo_rec[i].char_storage = state->undo_rec[i].char_storage + (short) n; // vsnet05
       }
       ++state->redo_point;
-      memmove(state->undo_rec + state->redo_point-1, state->undo_rec + state->redo_point, (STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_point)*sizeof(state->undo_rec[0]));
+      memmove(state->undo_rec + state->redo_point-1, state->undo_rec + state->redo_point, (size_t) ((STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_point)*sizeof(state->undo_rec[0])));
    }
 }
 
@@ -1203,7 +1204,7 @@ static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state)
    s->redo_point++;
 }
 
-static void stb_text_makeundo_insert(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length)
+static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int length)
 {
    stb_text_createundo(&state->undostate, where, 0, length);
 }