mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

switched wrap measurement to indexes instead of y values

master
Allen Webster 2016-09-27 14:51:58 -04:00
parent b54e11bc97
commit ab4bdaf535
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4ed_file.cpp
View File

@ -107,7 +107,7 @@ static Editing_File_Settings null_editing_file_settings = {0};
struct Editing_File_State{ struct Editing_File_State{
Buffer_Type buffer; Buffer_Type buffer;
f32 *wraps; i32 *wrap_line_index;
i32 wrap_max; i32 wrap_max;
i32 *character_starts; i32 *character_starts;

18
4ed_file_view.cpp
View File

@ -406,7 +406,7 @@ view_compute_cursor(View *view, Buffer_Seek seek){
params.width = view_file_display_width(view); params.width = view_file_display_width(view);
params.font_height = (f32)font->height; params.font_height = (f32)font->height;
params.adv = font->advance_data; params.adv = font->advance_data;
params.wraps = file->state.wraps; params.wrap_line_index = file->state.wrap_line_index;
params.character_starts = file->state.character_starts; params.character_starts = file->state.character_starts;
params.virtual_white = VWHITE; params.virtual_white = VWHITE;
@ -459,8 +459,7 @@ file_compute_lowest_line(Editing_File *file, f32 font_height){
lowest_line = buffer->line_count; lowest_line = buffer->line_count;
} }
else{ else{
f32 term_line_y = file->state.wraps[buffer->line_count]; lowest_line = file->state.wrap_line_index[buffer->line_count];
lowest_line = CEIL32(term_line_y/font_height);
} }
return(lowest_line); return(lowest_line);
@ -946,7 +945,7 @@ file_allocate_indents_as_needed(General_Memory *general, Editing_File *file){
inline void inline void
file_allocate_wraps_as_needed(General_Memory *general, Editing_File *file){ file_allocate_wraps_as_needed(General_Memory *general, Editing_File *file){
file_allocate_metadata_as_needed(general, &file->state.buffer, file_allocate_metadata_as_needed(general, &file->state.buffer,
(void**)&file->state.wraps, (void**)&file->state.wrap_line_index,
&file->state.wrap_max, sizeof(f32)); &file->state.wrap_max, sizeof(f32));
} }
@ -956,12 +955,11 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
file_allocate_indents_as_needed(&models->mem.general, file); file_allocate_indents_as_needed(&models->mem.general, file);
Buffer_Measure_Wrap_Params params; Buffer_Measure_Wrap_Params params;
params.buffer = &file->state.buffer; params.buffer = &file->state.buffer;
params.wraps = file->state.wraps; params.wrap_line_index = file->state.wrap_line_index;
params.font_height = font_height; params.adv = adv;
params.adv = adv; params.width = (f32)file->settings.display_width;
params.width = (f32)file->settings.display_width; params.virtual_white = VWHITE;
params.virtual_white = VWHITE;
Buffer_Measure_Wrap_State state = {0}; Buffer_Measure_Wrap_State state = {0};
Buffer_Layout_Stop stop = {0}; Buffer_Layout_Stop stop = {0};

51
buffer/4coder_buffer_abstract.cpp
View File

@ -181,8 +181,7 @@ buffer_measure_character_starts(Buffer_Type *buffer, i32 *character_starts, i32
struct Buffer_Measure_Wrap_Params{ struct Buffer_Measure_Wrap_Params{
Buffer_Type *buffer; Buffer_Type *buffer;
f32 *wraps; i32 *wrap_line_index;
f32 font_height;
f32 *adv; f32 *adv;
f32 width; f32 width;
b32 virtual_white; b32 virtual_white;
@ -192,9 +191,9 @@ struct Buffer_Measure_Wrap_State{
Buffer_Stream_Type stream; Buffer_Stream_Type stream;
i32 i; i32 i;
i32 size; i32 size;
i32 wrap_index; i32 line_index;
f32 current_wrap; i32 current_wrap_index;
f32 current_adv; f32 current_adv;
f32 x; f32 x;
@ -239,13 +238,13 @@ buffer_measure_wrap_y(Buffer_Measure_Wrap_State *S_ptr, Buffer_Measure_Wrap_Para
if (params.virtual_white){ if (params.virtual_white){
S_stop.status = BLStatus_NeedLineShift; S_stop.status = BLStatus_NeedLineShift;
S_stop.line_index = S.wrap_index; S_stop.line_index = S.line_index;
S_stop.pos = S.i; S_stop.pos = S.i;
DrYield(1, S_stop); DrYield(1, S_stop);
} }
S.x = line_shift; S.x = line_shift;
params.wraps[S.wrap_index++] = 0; params.wrap_line_index[S.line_index++] = 0;
if (params.virtual_white){ if (params.virtual_white){
S.skipping_whitespace = 1; S.skipping_whitespace = 1;
@ -257,12 +256,12 @@ buffer_measure_wrap_y(Buffer_Measure_Wrap_State *S_ptr, Buffer_Measure_Wrap_Para
for (; S.i < S.stream.end; ++S.i){ for (; S.i < S.stream.end; ++S.i){
S.ch = (u8)S.stream.data[S.i]; S.ch = (u8)S.stream.data[S.i];
if (S.ch == '\n'){ if (S.ch == '\n'){
S.current_wrap += params.font_height; ++S.current_wrap_index;
params.wraps[S.wrap_index++] = S.current_wrap; params.wrap_line_index[S.line_index++] = S.current_wrap_index;
if (params.virtual_white){ if (params.virtual_white){
S_stop.status = BLStatus_NeedLineShift; S_stop.status = BLStatus_NeedLineShift;
S_stop.line_index = S.wrap_index - 1; S_stop.line_index = S.line_index - 1;
S_stop.pos = S.i+1; S_stop.pos = S.i+1;
DrYield(2, S_stop); DrYield(2, S_stop);
} }
@ -281,11 +280,11 @@ buffer_measure_wrap_y(Buffer_Measure_Wrap_State *S_ptr, Buffer_Measure_Wrap_Para
if (!S.skipping_whitespace){ if (!S.skipping_whitespace){
S.current_adv = params.adv[S.ch]; S.current_adv = params.adv[S.ch];
if (S.x + S.current_adv > params.width){ if (S.x + S.current_adv > params.width){
S.current_wrap += params.font_height; ++S.current_wrap_index;
if (params.virtual_white){ if (params.virtual_white){
S_stop.status = BLStatus_NeedWrapLineShift; S_stop.status = BLStatus_NeedWrapLineShift;
S_stop.line_index = S.wrap_index - 1; S_stop.line_index = S.line_index - 1;
S_stop.pos = S.i; S_stop.pos = S.i;
DrYield(3, S_stop); DrYield(3, S_stop);
} }
@ -302,10 +301,10 @@ buffer_measure_wrap_y(Buffer_Measure_Wrap_State *S_ptr, Buffer_Measure_Wrap_Para
}while(S.still_looping); }while(S.still_looping);
} }
S.current_wrap += params.font_height; ++S.current_wrap_index;
params.wraps[S.wrap_index++] = S.current_wrap; params.wrap_line_index[S.line_index++] = S.current_wrap_index;
assert_4tech(S.wrap_index-1 == params.buffer->line_count); assert_4tech(S.line_index-1 == params.buffer->line_count);
S_stop.status = BLStatus_Finished; S_stop.status = BLStatus_Finished;
DrReturn(S_stop); DrReturn(S_stop);
@ -616,34 +615,36 @@ buffer_get_line_index_from_character_pos(i32 *character_starts, i32 pos, i32 l_b
end = i; end = i;
} }
else{ else{
start = i;
break; break;
} }
assert_4tech(start < end); assert_4tech(start < end);
if (start == end - 1){ if (start == end - 1){
i = start;
break; break;
} }
} }
return(start); return(i);
} }
internal_4tech i32 internal_4tech i32
buffer_get_line_index_from_wrapped_y(f32 *wraps, f32 y, f32 font_height, i32 l_bound, i32 u_bound){ buffer_get_line_index_from_wrapped_y(i32 *wrap_line_index, f32 y, f32 line_height, i32 l_bound, i32 u_bound){
i32 wrap_index = FLOOR32(y/line_height);
i32 start = l_bound, end = u_bound; i32 start = l_bound, end = u_bound;
i32 i = 0; i32 i = 0;
for (;;){ for (;;){
i = (start + end) / 2; i = (start + end) >> 1;
if (wraps[i]+font_height <= y){ if (wrap_line_index[i] < wrap_index){
start = i; start = i;
} }
else if (wraps[i] > y){ else if (wrap_line_index[i] > wrap_index){
end = i; end = i;
} }
else{ else{
break; break;
} }
if (start >= end - 1){ assert_4tech(start < end);
if (start == end - 1){
i = start; i = start;
break; break;
} }
@ -707,7 +708,7 @@ struct Buffer_Cursor_Seek_Params{
f32 width; f32 width;
f32 font_height; f32 font_height;
f32 *adv; f32 *adv;
f32 *wraps; i32 *wrap_line_index;
i32 *character_starts; i32 *character_starts;
b32 virtual_white; b32 virtual_white;
}; };
@ -801,8 +802,8 @@ buffer_cursor_seek(Buffer_Cursor_Seek_State *S_ptr, Buffer_Cursor_Seek_Params pa
case buffer_seek_wrapped_xy: case buffer_seek_wrapped_xy:
{ {
line_index = buffer_get_line_index_from_wrapped_y(params.wraps, params.seek.y, line_index = buffer_get_line_index_from_wrapped_y(params.wrap_line_index, params.seek.y, params.font_height,
params.font_height, 0, params.buffer->line_count); 0, params.buffer->line_count);
}break; }break;
default: InvalidCodePath; default: InvalidCodePath;
@ -816,7 +817,7 @@ buffer_cursor_seek(Buffer_Cursor_Seek_State *S_ptr, Buffer_Cursor_Seek_Params pa
S.cursor.character = 1; S.cursor.character = 1;
S.cursor.unwrapped_y = (f32)(line_index * params.font_height); S.cursor.unwrapped_y = (f32)(line_index * params.font_height);
S.cursor.unwrapped_x = 0; S.cursor.unwrapped_x = 0;
S.cursor.wrapped_y = params.wraps[line_index]; S.cursor.wrapped_y = (f32)(params.wrap_line_index[line_index] * params.font_height);
S.cursor.wrapped_x = 0; S.cursor.wrapped_x = 0;
} }