switched to better streaming API
This commit is contained in:
Allen Webster
parent
b84dcf03d7
commit
28b6132be5
|
|
@ -4882,8 +4882,6 @@ draw_file_loaded(View *view, i32_Rect rect, b32 is_active, Render_Target *target
|
|||
|
||||
}
|
||||
|
||||
Assert(count > 0);
|
||||
|
||||
i32 cursor_begin = 0, cursor_end = 0;
|
||||
u32 cursor_color = 0, at_cursor_color = 0;
|
||||
if (view->file_data.show_temp_highlight){
|
||||
|
|
|
|||
|
|
@ -11,33 +11,44 @@
|
|||
// TOP
|
||||
|
||||
#define Buffer_Init_Type cat_4tech(Buffer_Type, _Init)
|
||||
#define Buffer_Stringify_Type cat_4tech(Buffer_Type, _Stringify_Loop)
|
||||
#define Buffer_Stream_Type cat_4tech(Buffer_Type, _Stream)
|
||||
|
||||
inline_4tech void
|
||||
buffer_stringify(Buffer_Type *buffer, i32 start, i32 end, char *out){
|
||||
for (Buffer_Stringify_Type loop = buffer_stringify_loop(buffer, start, end);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
memcpy_4tech(out, loop.data, loop.size);
|
||||
out += loop.size;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
|
||||
i32 i = start;
|
||||
if (buffer_stringify_loop(&stream, buffer, i, end)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
i32 size = stream.end - i;
|
||||
memcpy_4tech(out, stream.data + i, size);
|
||||
i = stream.end;
|
||||
out += size;
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
}
|
||||
|
||||
internal_4tech i32
|
||||
buffer_convert_out(Buffer_Type *buffer, char *dest, i32 max){
|
||||
Buffer_Stringify_Type loop;
|
||||
i32 size, out_size, pos, result;
|
||||
|
||||
size = buffer_size(buffer);
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 i = 0;
|
||||
i32 size = buffer_size(buffer);
|
||||
assert_4tech(size + buffer->line_count <= max);
|
||||
|
||||
pos = 0;
|
||||
for (loop = buffer_stringify_loop(buffer, 0, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
result = eol_convert_out(dest + pos, max - pos, loop.data, loop.size, &out_size);
|
||||
i32 pos = 0;
|
||||
if (buffer_stringify_loop(&stream, buffer, 0, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
i32 size = stream.end - i;
|
||||
i32 out_size = 0;
|
||||
i32 result = eol_convert_out(dest + pos, max - pos, stream.data + i, size, &out_size);
|
||||
assert_4tech(result);
|
||||
i = stream.end;
|
||||
pos += out_size;
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
return(pos);
|
||||
|
|
@ -45,22 +56,22 @@ buffer_convert_out(Buffer_Type *buffer, char *dest, i32 max){
|
|||
|
||||
internal_4tech i32
|
||||
buffer_count_newlines(Buffer_Type *buffer, i32 start, i32 end){
|
||||
Buffer_Stringify_Type loop;
|
||||
i32 i;
|
||||
i32 count;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 i = start;
|
||||
i32 count = 0;
|
||||
|
||||
assert_4tech(0 <= start);
|
||||
assert_4tech(start <= end);
|
||||
assert_4tech(end <= buffer_size(buffer));
|
||||
|
||||
count = 0;
|
||||
|
||||
for (loop = buffer_stringify_loop(buffer, start, end);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
for (i = 0; i < loop.size; ++i){
|
||||
count += (loop.data[i] == '\n');
|
||||
if (buffer_stringify_loop(&stream, buffer, i, end)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; i < stream.end; ++i){
|
||||
count += (stream.data[i] == '\n');
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
return(count);
|
||||
|
|
@ -77,23 +88,18 @@ typedef struct Buffer_Measure_Starts{
|
|||
// and stores the size in the extra spot.
|
||||
internal_4tech i32
|
||||
buffer_measure_starts(Buffer_Measure_Starts *state, Buffer_Type *buffer){
|
||||
Buffer_Stringify_Type loop = {0};
|
||||
char *data = 0;
|
||||
i32 end = 0;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 size = buffer_size(buffer);
|
||||
i32 start = state->start, i = state->i;
|
||||
i32 *start_ptr = buffer->line_starts + state->count;
|
||||
i32 *start_end = buffer->line_starts + buffer->line_max;
|
||||
i32 result = 1;
|
||||
char ch = 0;
|
||||
|
||||
for (loop = buffer_stringify_loop(buffer, i, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
end = loop.size + loop.absolute_pos;
|
||||
data = loop.data - loop.absolute_pos;
|
||||
for (; i < end; ++i){
|
||||
ch = data[i];
|
||||
if (buffer_stringify_loop(&stream, buffer, i, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; i < stream.end; ++i){
|
||||
char ch = stream.data[i];
|
||||
if (ch == '\n'){
|
||||
if (start_ptr == start_end){
|
||||
goto buffer_measure_starts_widths_end;
|
||||
|
|
@ -103,6 +109,8 @@ buffer_measure_starts(Buffer_Measure_Starts *state, Buffer_Type *buffer){
|
|||
start = i + 1;
|
||||
}
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
assert_4tech(i == size);
|
||||
|
|
@ -123,9 +131,7 @@ buffer_measure_starts(Buffer_Measure_Starts *state, Buffer_Type *buffer){
|
|||
|
||||
internal_4tech void
|
||||
buffer_measure_wrap_y(Buffer_Type *buffer, f32 *wraps, f32 font_height, f32 *adv, f32 max_width){
|
||||
Buffer_Stringify_Type loop = {0};
|
||||
char *data = 0;
|
||||
i32 end = 0;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 i = 0;
|
||||
i32 size = buffer_size(buffer);
|
||||
|
||||
|
|
@ -135,13 +141,11 @@ buffer_measure_wrap_y(Buffer_Type *buffer, f32 *wraps, f32 font_height, f32 *adv
|
|||
|
||||
f32 x = 0.f;
|
||||
|
||||
for (loop = buffer_stringify_loop(buffer, i, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
end = loop.size + loop.absolute_pos;
|
||||
data = loop.data - loop.absolute_pos;
|
||||
for (; i < end; ++i){
|
||||
u8 ch = (u8)data[i];
|
||||
if (buffer_stringify_loop(&stream, buffer, i, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; i < stream.end; ++i){
|
||||
u8 ch = (u8)stream.data[i];
|
||||
if (ch == '\n'){
|
||||
wraps[wrap_index++] = last_wrap;
|
||||
current_wrap += font_height;
|
||||
|
|
@ -159,6 +163,8 @@ buffer_measure_wrap_y(Buffer_Type *buffer, f32 *wraps, f32 font_height, f32 *adv
|
|||
}
|
||||
}
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
wraps[wrap_index++] = last_wrap;
|
||||
|
|
@ -201,9 +207,7 @@ buffer_remeasure_starts(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
}
|
||||
|
||||
// Iteration data (yikes! Need better loop system)
|
||||
Buffer_Stringify_Type loop = {0};
|
||||
i32 end = 0;
|
||||
char *data = 0;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 size = buffer_size(buffer);
|
||||
i32 char_i = starts[line_start];
|
||||
i32 line_i = line_start;
|
||||
|
|
@ -211,13 +215,11 @@ buffer_remeasure_starts(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
// Line start measurement
|
||||
i32 start = char_i;
|
||||
|
||||
for (loop = buffer_stringify_loop(buffer, char_i, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
end = loop.size + loop.absolute_pos;
|
||||
data = loop.data - loop.absolute_pos;
|
||||
for (; char_i < end; ++char_i){
|
||||
u8 ch = (u8)data[char_i];
|
||||
if (buffer_stringify_loop(&stream, buffer, char_i, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; char_i < stream.end; ++char_i){
|
||||
u8 ch = (u8)stream.data[char_i];
|
||||
|
||||
if (ch == '\n'){
|
||||
starts[line_i] = start;
|
||||
|
|
@ -231,6 +233,8 @@ buffer_remeasure_starts(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
}
|
||||
}
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
// TODO(allen): I suspect this can just go away.
|
||||
|
|
@ -266,9 +270,7 @@ buffer_remeasure_wrap_y(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
}
|
||||
|
||||
// Iteration data (yikes! Need better loop system)
|
||||
Buffer_Stringify_Type loop = {0};
|
||||
i32 end = 0;
|
||||
char *data = 0;
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 size = buffer_size(buffer);
|
||||
i32 char_i = buffer->line_starts[line_start];
|
||||
i32 line_i = line_start;
|
||||
|
|
@ -278,13 +280,11 @@ buffer_remeasure_wrap_y(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
f32 current_wrap = last_wrap;
|
||||
f32 x = 0.f;
|
||||
|
||||
for (loop = buffer_stringify_loop(buffer, char_i, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
end = loop.size + loop.absolute_pos;
|
||||
data = loop.data - loop.absolute_pos;
|
||||
for (; char_i < end; ++char_i){
|
||||
u8 ch = (u8)data[char_i];
|
||||
if (buffer_stringify_loop(&stream, buffer, char_i, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; char_i < stream.end; ++char_i){
|
||||
u8 ch = (u8)stream.data[char_i];
|
||||
|
||||
if (ch == '\n'){
|
||||
wraps[line_i] = last_wrap;
|
||||
|
|
@ -309,6 +309,8 @@ buffer_remeasure_wrap_y(Buffer_Type *buffer, i32 line_start, i32 line_end, i32 l
|
|||
}
|
||||
}
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
wraps[line_i++] = last_wrap;
|
||||
|
|
@ -393,7 +395,7 @@ typedef struct Seek_State{
|
|||
|
||||
internal_4tech i32
|
||||
cursor_seek_step(Seek_State *state, Buffer_Seek seek, i32 xy_seek, f32 max_width,
|
||||
f32 font_height, f32 *adv, i32 size, uint8_t ch){
|
||||
f32 font_height, f32 *adv, i32 size, u8 ch){
|
||||
Full_Cursor cursor = state->cursor;
|
||||
Full_Cursor prev_cursor = cursor;
|
||||
i32 result = 1;
|
||||
|
|
@ -494,11 +496,7 @@ cursor_seek_step(Seek_State *state, Buffer_Seek seek, i32 xy_seek, f32 max_width
|
|||
internal_4tech Full_Cursor
|
||||
buffer_cursor_seek(Buffer_Type *buffer, Buffer_Seek seek, f32 max_width,
|
||||
f32 font_height, f32 *adv, Full_Cursor cursor){
|
||||
Buffer_Stringify_Type loop;
|
||||
char *data;
|
||||
i32 size, end;
|
||||
i32 i;
|
||||
i32 result;
|
||||
i32 result = 0;
|
||||
|
||||
Seek_State state;
|
||||
i32 xy_seek;
|
||||
|
|
@ -524,22 +522,28 @@ buffer_cursor_seek(Buffer_Type *buffer, Buffer_Seek seek, f32 max_width,
|
|||
}
|
||||
|
||||
if (adv){
|
||||
size = buffer_size(buffer);
|
||||
xy_seek = (seek.type == buffer_seek_wrapped_xy || seek.type == buffer_seek_unwrapped_xy);
|
||||
Buffer_Stream_Type stream = {0};
|
||||
i32 size = buffer_size(buffer);
|
||||
i32 i = cursor.pos;
|
||||
|
||||
xy_seek = (seek.type == buffer_seek_wrapped_xy || seek.type == buffer_seek_unwrapped_xy);
|
||||
result = 1;
|
||||
i = cursor.pos;
|
||||
for (loop = buffer_stringify_loop(buffer, i, size);
|
||||
buffer_stringify_good(&loop);
|
||||
buffer_stringify_next(&loop)){
|
||||
end = loop.size + loop.absolute_pos;
|
||||
data = loop.data - loop.absolute_pos;
|
||||
for (; i < end; ++i){
|
||||
|
||||
if (buffer_stringify_loop(&stream, buffer, i, size)){
|
||||
b32 still_looping = 0;
|
||||
do{
|
||||
for (; i < stream.end; ++i){
|
||||
u8 ch = (u8)stream.data[i];
|
||||
result = cursor_seek_step(&state, seek, xy_seek, max_width,
|
||||
font_height, adv, size, data[i]);
|
||||
if (!result) goto buffer_cursor_seek_end;
|
||||
font_height, adv, size, ch);
|
||||
if (!result){
|
||||
goto buffer_cursor_seek_end;
|
||||
}
|
||||
}
|
||||
still_looping = buffer_stringify_next(&stream);
|
||||
}while(still_looping);
|
||||
}
|
||||
|
||||
if (result){
|
||||
result = cursor_seek_step(&state, seek, xy_seek, max_width,
|
||||
font_height, adv, size, 0);
|
||||
|
|
@ -547,7 +551,7 @@ buffer_cursor_seek(Buffer_Type *buffer, Buffer_Seek seek, f32 max_width,
|
|||
}
|
||||
}
|
||||
|
||||
buffer_cursor_seek_end:
|
||||
buffer_cursor_seek_end:;
|
||||
return(state.cursor);
|
||||
}
|
||||
|
||||
|
|
@ -797,10 +801,8 @@ struct Buffer_Render_Params{
|
|||
};
|
||||
|
||||
struct Buffer_Render_State{
|
||||
Buffer_Stringify_Type loop;
|
||||
char *data;
|
||||
i32 end;
|
||||
i32 size;
|
||||
Buffer_Stream_Type stream;
|
||||
b32 still_looping;
|
||||
i32 i;
|
||||
|
||||
f32 ch_width;
|
||||
|
|
@ -872,15 +874,11 @@ buffer_render_data(Buffer_Render_State *S_ptr, Buffer_Render_Params params, f32
|
|||
S.write.x_max = params.port_x + params.clip_w;
|
||||
|
||||
if (params.adv){
|
||||
for (S.loop = buffer_stringify_loop(params.buffer, params.start_cursor.pos, size);
|
||||
buffer_stringify_good(&S.loop) && S.write.item < item_end;
|
||||
buffer_stringify_next(&S.loop)){
|
||||
|
||||
S.end = S.loop.size + S.loop.absolute_pos;
|
||||
S.data = S.loop.data - S.loop.absolute_pos;
|
||||
|
||||
for (S.i = S.loop.absolute_pos; S.i < S.end; ++S.i){
|
||||
S.ch = (uint8_t)S.data[S.i];
|
||||
S.i = params.start_cursor.pos;
|
||||
if (buffer_stringify_loop(&S.stream, params.buffer, S.i, size)){
|
||||
do{
|
||||
for (; S.i < S.stream.end; ++S.i){
|
||||
S.ch = (u8)S.stream.data[S.i];
|
||||
S.ch_width = measure_character(params.adv, S.ch);
|
||||
|
||||
if (S.ch_width + S.write.x > params.width + shift_x && S.ch != '\n' && params.wrapped){
|
||||
|
|
@ -980,6 +978,8 @@ buffer_render_data(Buffer_Render_State *S_ptr, Buffer_Render_Params params, f32
|
|||
goto buffer_get_render_data_end;
|
||||
}
|
||||
}
|
||||
S.still_looping = buffer_stringify_next(&S.stream);
|
||||
}while(S.still_looping);
|
||||
}
|
||||
|
||||
buffer_get_render_data_end:;
|
||||
|
|
|
|||
|
|
@ -101,12 +101,9 @@ buffer_end_init(Gap_Buffer_Init *init, void *scratch, i32 scratch_size){
|
|||
typedef struct Gap_Buffer_Stream{
|
||||
Gap_Buffer *buffer;
|
||||
char *data;
|
||||
char *base;
|
||||
i32 absolute_pos;
|
||||
i32 pos;
|
||||
i32 end;
|
||||
i32 size;
|
||||
i32 separated;
|
||||
i32 absolute_end;
|
||||
} Gap_Buffer_Stream;
|
||||
|
||||
internal_4tech b32
|
||||
|
|
@ -115,38 +112,34 @@ buffer_stringify_loop(Gap_Buffer_Stream *stream, Gap_Buffer *buffer, i32 start,
|
|||
|
||||
if (0 <= start && start < end && end <= buffer->size1 + buffer->size2){
|
||||
stream->buffer = buffer;
|
||||
stream->base = buffer->data;
|
||||
stream->absolute_pos = start;
|
||||
|
||||
if (end <= buffer->size1){
|
||||
stream->end = end;
|
||||
}
|
||||
else{
|
||||
stream->end = end + buffer->gap_size;
|
||||
}
|
||||
stream->absolute_end = end;
|
||||
|
||||
if (start < buffer->size1){
|
||||
if (end <= buffer->size1){
|
||||
stream->separated = 0;
|
||||
}
|
||||
else{
|
||||
if (buffer->size1 < end){
|
||||
stream->separated = 1;
|
||||
}
|
||||
stream->pos = start;
|
||||
else{
|
||||
stream->separated = 0;
|
||||
}
|
||||
stream->data = buffer->data;
|
||||
}
|
||||
else{
|
||||
stream->separated = 0;
|
||||
stream->pos = start + buffer->gap_size;
|
||||
stream->data = buffer->data + buffer->gap_size;
|
||||
}
|
||||
|
||||
if (stream->separated){
|
||||
stream->size = buffer->size1 - start;
|
||||
stream->end = buffer->size1;
|
||||
}
|
||||
else{
|
||||
stream->size = end - start;
|
||||
stream->end = end;
|
||||
}
|
||||
|
||||
stream->data = buffer->data + stream->pos;
|
||||
if (stream->end > stream->absolute_end){
|
||||
stream->end = stream->absolute_end;
|
||||
}
|
||||
|
||||
result = 1;
|
||||
}
|
||||
|
||||
return(result);
|
||||
|
|
@ -154,20 +147,15 @@ buffer_stringify_loop(Gap_Buffer_Stream *stream, Gap_Buffer *buffer, i32 start,
|
|||
|
||||
internal_4tech b32
|
||||
buffer_stringify_next(Gap_Buffer_Stream *stream){
|
||||
i32 size1 = 0, temp_end = 0;
|
||||
b32 result = 0;
|
||||
Gap_Buffer *buffer = stream->buffer;
|
||||
if (stream->separated){
|
||||
stream->data = buffer->data + buffer->gap_size;
|
||||
stream->end = stream->absolute_end;
|
||||
stream->separated = 0;
|
||||
size1 = stream->buffer->size1;
|
||||
stream->pos = stream->buffer->gap_size + size1;
|
||||
stream->absolute_pos = size1;
|
||||
temp_end = stream->end;
|
||||
result = 1;
|
||||
}
|
||||
else{
|
||||
stream->buffer = 0;
|
||||
temp_end = stream->pos;
|
||||
}
|
||||
stream->size = temp_end - stream->pos;
|
||||
stream->data = stream->base + stream->pos;
|
||||
return(result);
|
||||
}
|
||||
|
||||
internal_4tech i32
|
||||
|
|
|
|||
Loading…
Reference in New Issue