ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory viewer (hex editor) window viewport calculation improvement. Much more accurate and efficient than previous.

This commit is contained in:
Matthew Budd 2020-05-29 06:52:53 -04:00
parent 4c3bf6cf6c
commit 0d9b9254ff
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/drivers/sdl/memview.cpp
View File

@ -523,32 +523,51 @@ void memViewWin_t::showMemViewResults (int reset)
int memViewWin_t::calcVisibleRange( int *start_out, int *end_out, int *center_out ) int memViewWin_t::calcVisibleRange( int *start_out, int *end_out, int *center_out )
{ {
GtkAdjustment *ivadj; //GtkAdjustment *ivadj;
double v, l, u, r; //double v, l, u, r;
int start, end, center; int start, end, center;
GdkRectangle rect;
GtkTextIter iter;
ivadj = gtk_range_get_adjustment( GTK_RANGE(ivbar) ); gtk_text_view_get_visible_rect( textview, &rect );
gtk_text_view_get_line_at_y( textview, &iter, rect.y, NULL );
start = gtk_text_iter_get_line( &iter ) - 1;
v = gtk_range_get_value( GTK_RANGE(ivbar) ); gtk_text_view_get_line_at_y( textview, &iter, rect.y+rect.height, NULL );
l = gtk_adjustment_get_lower( ivadj ); end = gtk_text_iter_get_line( &iter ) + 1;
u = gtk_adjustment_get_upper( ivadj );
r = (v - l) / (u - l); if ( start < 0 ) start = 0;
start = ((int)( r * (double)numLines )) - 16;
if ( start < 0 )
{
start = 0;
}
end = start + 64;
if ( end > numLines ) if ( end > numLines )
{ {
end = numLines; end = numLines;
} }
//printf("Line Iter: %i -> %i\n", start, end );
//ivadj = gtk_range_get_adjustment( GTK_RANGE(ivbar) );
//v = gtk_range_get_value( GTK_RANGE(ivbar) );
//l = gtk_adjustment_get_lower( ivadj );
//u = gtk_adjustment_get_upper( ivadj );
//r = (v - l) / (u - l);
//start = ((int)( r * (double)numLines )) - 16;
//if ( start < 0 )
//{
// start = 0;
//}
//end = start + 64;
//if ( end > numLines )
//{
// end = numLines;
//}
center = start + (end - start)/2; center = start + (end - start)/2;
//printf(" Start:%i End:%i 0x%08x -> 0x%08x \n", start, end, start * 16, end * 16 ); //printf(" Start:%i End:%i 0x%08x -> 0x%08x \n", start, end, start * 16, end * 16 );
@ -557,6 +576,9 @@ int memViewWin_t::calcVisibleRange( int *start_out, int *end_out, int *center_ou
if ( end_out ) *end_out = end; if ( end_out ) *end_out = end;
if ( center_out ) *center_out = center; if ( center_out ) *center_out = center;
//printf("Start:%i End:%i StartADDR:%08X EndADDR:%08X Rect: X:%i Y:%i W:%i H:%i \n",
// start, end, start*16, end*16, rect.x, rect.y, rect.width, rect.height );
return 0; return 0;
} }