mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

grid: don't implement grid_swap_row() in the header file

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-10 16:08:53 +02:00
parent ea1b618b6d
commit 8f0d574dcb
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 14 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

91
grid.c
View file

@ -1,92 +1,27 @@
#include "grid.h"
#include <string.h>
//#include <string.h>
#include <assert.h>
#define LOG_MODULE "grid"
#define LOG_ENABLE_DBG 0
#include "log.h"
#if 0
struct cell *
grid_get_range(struct grid *grid, int start, int *length)
{
#define min(x, y) ((x) < (y) ? (x) : (y))
assert(*length <= grid->size);
int real_start = (grid->offset + start) % grid->size;
if (real_start < 0)
real_start += grid->size;
assert(real_start >= 0);
assert(real_start < grid->size);
*length = min(*length, grid->size - real_start);
assert(real_start + *length <= grid->size);
return &grid->cells[real_start];
#undef min
}
void
grid_memclear(struct grid *grid, int start, int length)
grid_swap_row(struct grid *grid, int row_a, int row_b)
{
int left = length;
while (left > 0) {
int count = left;
struct cell *cells = grid_get_range(grid, start, &count);
assert(grid->offset >= 0);
assert(row_a != row_b);
assert(row_a >= 0);
assert(row_b >= 0);
assert(count > 0);
assert(count <= left);
int real_a = (grid->offset + row_a + grid->num_rows) % grid->num_rows;
int real_b = (grid->offset + row_b + grid->num_rows) % grid->num_rows;
memset(cells, 0, count * sizeof(cells[0]));
struct row *tmp = grid->rows[real_a];
grid->rows[real_a] = grid->rows[real_b];
grid->rows[real_b] = tmp;
left -= count;
start += count;
}
grid->rows[real_a]->dirty = true;
grid->rows[real_b]->dirty = true;
}
void
grid_memmove(struct grid *grid, int dst, int src, int length)
{
/* Fast path, we can move everything in one swoop */
{
int count = length;
struct cell *dst_cells = grid_get_range(grid, dst, &count);
if (count == length) {
struct cell *src_cells = grid_get_range(grid, src, &count);
if (count == length) {
memmove(dst_cells, src_cells, length * sizeof(dst_cells[0]));
return;
}
}
}
int left = length;
int copy_idx = 0;
struct cell copy[left];
while (left > 0) {
int count = left;
struct cell *src_cells = grid_get_range(grid, src, &count);
memcpy(&copy[copy_idx], src_cells, count * sizeof(copy[0]));
left -= count;
src += count;
copy_idx += count;
}
left = length;
copy_idx = 0;
while (left > 0) {
int count = left;
struct cell *dst_cells = grid_get_range(grid, dst, &count);
memcpy(dst_cells, &copy[copy_idx], count * sizeof(copy[0]));
left -= count;
dst += count;
copy_idx += count;
}
}
#endif

25
grid.h
View file

@ -17,27 +17,4 @@ grid_row_in_view(struct grid *grid, int row)
return grid->rows[(grid->view + row + grid->num_rows) % grid->num_rows];
}
static inline void
grid_swap_row(struct grid *grid, int row_a, int row_b)
{
assert(grid->offset >= 0);
assert(row_a != row_b);
assert(row_a >= 0);
assert(row_b >= 0);
int real_a = (grid->offset + row_a + grid->num_rows) % grid->num_rows;
int real_b = (grid->offset + row_b + grid->num_rows) % grid->num_rows;
struct row *tmp = grid->rows[real_a];
grid->rows[real_a] = grid->rows[real_b];
grid->rows[real_b] = tmp;
grid->rows[real_a]->dirty = true;
grid->rows[real_b]->dirty = true;
}
#if 0
struct cell *grid_get_range(struct grid *grid, int start, int *length);
void grid_memclear(struct grid *grid, int start, int length);
void grid_memmove(struct grid *grid, int dst, int src, int length);
#endif
void grid_swap_row(struct grid *grid, int row_a, int row_b);