diff --git a/data/core/commands/doc.lua b/data/core/commands/doc.lua index a571b1bb..7787054c 100644 --- a/data/core/commands/doc.lua +++ b/data/core/commands/doc.lua @@ -53,18 +53,6 @@ local function save(filename) core.log("Saved \"%s\"", saved_filename) end - -local function split_cursor(direction) - local new_cursors = {} - for _, line1, col1 in doc():get_selections() do - if line1 > 1 and line1 < #doc().lines then - table.insert(new_cursors, { line1 + direction, col1 }) - end - end - for i,v in ipairs(new_cursors) do doc():add_selection(v[1], v[2]) end - core.blink_reset() -end - local function cut_or_copy(delete) local full_text = "" for idx, line1, col1, line2, col2 in doc():get_selections() do @@ -79,12 +67,21 @@ local function cut_or_copy(delete) doc().cursor_clipboard[idx] = "" end end - if #doc().cursor_clipboard > 1 then - doc().cursor_clipboard["hash"] = system.hash(full_text) - end + doc().cursor_clipboard["full"] = full_text system.set_clipboard(full_text) end +local function split_cursor(direction) + local new_cursors = {} + for _, line1, col1 in doc():get_selections() do + if line1 > 1 and line1 < #doc().lines then + table.insert(new_cursors, { line1 + direction, col1 }) + end + end + for i,v in ipairs(new_cursors) do doc():add_selection(v[1], v[2]) end + core.blink_reset() +end + local commands = { ["doc:undo"] = function() doc():undo() @@ -105,7 +102,7 @@ local commands = { ["doc:paste"] = function() local clipboard = system.get_clipboard() -- If the clipboard has changed since our last look, use that instead - if doc().cursor_clipboard["hash"] ~= system.hash(clipboard) then + if doc().cursor_clipboard["full"] ~= clipboard then doc().cursor_clipboard = {} end for idx, line1, col1, line2, col2 in doc():get_selections() do diff --git a/src/api/system.c b/src/api/system.c index 85238e34..2f1bf763 100644 --- a/src/api/system.c +++ b/src/api/system.c @@ -637,14 +637,6 @@ static int f_set_window_opacity(lua_State *L) { return 1; } -static int f_hash(lua_State* L) { - unsigned i = RENCACHE_HASH_INITIAL; - size_t strLen; - const char *str = luaL_checklstring(L, 1, &strLen); - rencache_hash(&i, str, strLen) ; - lua_pushnumber(L, i); - return 1; -} static const luaL_Reg lib[] = { { "poll_event", f_poll_event }, @@ -672,7 +664,6 @@ static const luaL_Reg lib[] = { { "exec", f_exec }, { "fuzzy_match", f_fuzzy_match }, { "set_window_opacity", f_set_window_opacity }, - { "hash", f_hash }, { NULL, NULL } }; diff --git a/src/rencache.c b/src/rencache.c index 530615f4..31165e90 100644 --- a/src/rencache.c +++ b/src/rencache.c @@ -83,7 +83,10 @@ static void font_refs_clear(lua_State *L) { font_refs_len = 0; } -void rencache_hash(unsigned *h, const void *data, int size) { +/* 32bit fnv-1a hash */ +#define HASH_INITIAL 2166136261 + +static void hash(unsigned *h, const void *data, int size) { const unsigned char *p = data; while (size--) { *h = (*h ^ *p++) * 16777619; @@ -224,7 +227,7 @@ static void update_overlapping_cells(RenRect r, unsigned h) { for (int y = y1; y <= y2; y++) { for (int x = x1; x <= x2; x++) { int idx = cell_idx(x, y); - rencache_hash(&cells[idx], &h, sizeof(h)); + hash(&cells[idx], &h, sizeof(h)); } } } @@ -252,8 +255,8 @@ void rencache_end_frame(lua_State *L) { if (cmd->type == SET_CLIP) { cr = cmd->rect; } RenRect r = intersect_rects(cmd->rect, cr); if (r.width == 0 || r.height == 0) { continue; } - unsigned h = RENCACHE_HASH_INITIAL; - rencache_hash(&h, cmd, cmd->size); + unsigned h = HASH_INITIAL; + hash(&h, cmd, cmd->size); update_overlapping_cells(r, h); } @@ -268,7 +271,7 @@ void rencache_end_frame(lua_State *L) { if (cells[idx] != cells_prev[idx]) { push_rect((RenRect) { x, y, 1, 1 }, &rect_count); } - cells_prev[idx] = RENCACHE_HASH_INITIAL; + cells_prev[idx] = HASH_INITIAL; } } diff --git a/src/rencache.h b/src/rencache.h index 95a088d6..1d0f45a6 100644 --- a/src/rencache.h +++ b/src/rencache.h @@ -5,12 +5,8 @@ #include #include "renderer.h" -/* 32bit fnv-1a hash */ -#define RENCACHE_HASH_INITIAL 2166136261 - void rencache_show_debug(bool enable); void rencache_set_clip_rect(RenRect rect); -void rencache_hash(unsigned *h, const void *data, int size); void rencache_draw_rect(RenRect rect, RenColor color); int rencache_draw_text(lua_State *L, FontDesc *font_desc, int font_index, const char *text, int x, int y, RenColor color, bool draw_subpixel, CPReplaceTable *replacements, RenColor replace_color);