Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-07-04 23:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Don't allow reaching beyond buffer row bounds

Browse Source
This commit is contained in:
Aaron Culliney 2016-02-15 14:00:06 -08:00
parent 545376b1be
commit bac745845b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/gltouchkbd.c
View File

@ -282,6 +282,8 @@ static inline void _screen_to_keyboard(float x, float y, OUTPARM int *col, OUTPA
*row = (y - touchport.kbdY) / keyH;
if (*row < 0) {
*row = 0;
} else if (*row >= hudKeyboard->tplHeight) {
*row = hudKeyboard->tplHeight-1;
}
TOUCH_KBD_LOG("SCREEN TO KEYBOARD : kbdX:%d kbdXMax:%d kbdW:%d keyW:%d ... scrn:(%f,%f)->kybd:(%d,%d)", touchport.kbdX, touchport.kbdXMax, touchport.kbdW, keyW, x, y, *col, *row);

2
src/video/gltouchmenu.c
View File

@ -167,6 +167,8 @@ static inline void _screen_to_menu(float x, float y, OUTPARM int *col, OUTPARM i
*row = y / keyH;
if (*row < 0) {
*row = 0;
} else if (*row >= hudMenu->tplHeight) {
*row = hudMenu->tplWidth-1;
}
//LOG("SCREEN TO MENU : menuX:%d menuXMax:%d menuW:%d keyW:%d ... scrn:(%f,%f)->kybd:(%d,%d)", touchport.topLeftX, touchport.topLeftXMax, touchport.width, keyW, x, y, *col, *row);