mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1489 from lakkatv/xmb

Browse Source 
(Apple) Fix mouse movements
This commit is contained in:
Twinaphex 2015-03-10 18:53:35 +01:00
commit 1ae12d462c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apple/OSX/platform.m
View File

@ -103,8 +103,8 @@ void apple_rarch_exited(void)
{ {
NSPoint pos; NSPoint pos;
// Relative // Relative
apple->mouse_x += event.deltaX; apple->mouse_x = event.deltaX;
apple->mouse_y += event.deltaY; apple->mouse_y = event.deltaY;
// Absolute // Absolute
pos = [[RAGameView get] convertPoint:[event locationInWindow] fromView:nil]; pos = [[RAGameView get] convertPoint:[event locationInWindow] fromView:nil];
@ -189,6 +189,14 @@ static char** waiting_argv;
{ {
NSEvent *event; NSEvent *event;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
if (!apple)
return;
apple->mouse_x = 0;
apple->mouse_y = 0;
do do
{ {
event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES]; event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];

3
input/drivers/apple_input.c
View File

@ -260,9 +260,6 @@ static void apple_input_poll(void *data)
if (apple->icade_enabled) if (apple->icade_enabled)
BIT32_SET(apple->buttons[0], apple->icade_buttons); BIT32_SET(apple->buttons[0], apple->icade_buttons);
apple->mouse_x = 0;
apple->mouse_y = 0;
} }
static int16_t apple_mouse_state(apple_input_data_t *apple, static int16_t apple_mouse_state(apple_input_data_t *apple,

1
menu/drivers/xmb.c
View File

@ -1194,6 +1194,7 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, float x, float y)
glBindTexture(GL_TEXTURE_2D, xmb->textures.list[XMB_TEXTURE_POINTER].id); glBindTexture(GL_TEXTURE_2D, xmb->textures.list[XMB_TEXTURE_POINTER].id);
matrix_4x4_rotate_z(&mrot, 0);
matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot); matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot);
glEnable(GL_BLEND); glEnable(GL_BLEND);