|
@@ -445,7 +445,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 +649,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 +684,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 +1007,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 +1031,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 +1203,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);
|
|
|
}
|