len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make --zoom option of the sdl port correctly work with mouse clicks.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28500 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-11-05 21:50:23 +00:00
parent 12f5a1e60e
commit c044117c5f
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/target/hosted/sdl/button-sdl.c
View file

@ -96,7 +96,7 @@ static void touchscreen_event(int x, int y)
mouse_coords = (x << 16) | y; mouse_coords = (x << 16) | y;
button_event(BUTTON_TOUCHSCREEN, true); button_event(BUTTON_TOUCHSCREEN, true);
if (debug_wps) if (debug_wps)
printf("Mouse at: (%d, %d)\n", x, y); printf("Mouse at 1: (%d, %d)\n", x, y);
} }
} }
#endif #endif
@ -193,15 +193,15 @@ static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
} }
else else
{ {
m_x = event->x / display_zoom; m_x = event->x;
m_y = event->y / display_zoom; m_y = event->y;
#ifdef HAVE_REMOTE #ifdef HAVE_REMOTE
if ( m_y >= LCD_HEIGHT ) /* Remote Screen */ if ( m_y >= LCD_HEIGHT ) /* Remote Screen */
m_y -= LCD_HEIGHT; m_y -= LCD_HEIGHT;
#endif #endif
} }
printf("Mouse at: (%d, %d)\n", m_x, m_y); printf("Mouse at 2: (%d, %d)\n", m_x, m_y);
} }
} }
#undef SQUARE #undef SQUARE
@ -218,15 +218,23 @@ static bool event_handler(SDL_Event *event)
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
if (event->motion.state & SDL_BUTTON(1)) if (event->motion.state & SDL_BUTTON(1))
touchscreen_event(event->motion.x, event->motion.y); {
int x = event->motion.x / display_zoom;
int y = event->motion.y / display_zoom;
touchscreen_event(x, y);
}
break; break;
#endif #endif
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
mouse_event(&event->button, event->type == SDL_MOUSEBUTTONUP); {
SDL_MouseButtonEvent *mev = &event->button;
mev->x /= display_zoom;
mev->y /= display_zoom;
mouse_event(mev, event->type == SDL_MOUSEBUTTONUP);
break; break;
}
case SDL_QUIT: case SDL_QUIT:
return true; return true;
} }