geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haiku: mouse->ShowMouse method added 

Partially fixes Bugzilla #4442.
Peter Kosyh 2019-11-11 22:22:40 -05:00
parent 95a402d745
commit 79510b7569
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/haiku/SDL_BApp.h
View File

@ -244,7 +244,7 @@ private:
be_app->HideCursor(); be_app->HideCursor();
} else { } else {
SDL_SendMouseMotion(win, 0, 0, x, y); SDL_SendMouseMotion(win, 0, 0, x, y);
if (be_app->IsCursorHidden()) if (SDL_ShowCursor(-1) && be_app->IsCursorHidden())
be_app->ShowCursor(); be_app->ShowCursor();
} }

30
src/video/haiku/SDL_bvideo.cc
View File

@ -19,6 +19,7 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#include "../../main/haiku/SDL_BApp.h"
#if SDL_VIDEO_DRIVER_HAIKU #if SDL_VIDEO_DRIVER_HAIKU
@ -132,6 +133,33 @@ void HAIKU_DeleteDevice(SDL_VideoDevice * device)
SDL_free(device); SDL_free(device);
} }
static int HAIKU_ShowCursor(SDL_Cursor *cur)
{
SDL_Mouse *mouse = SDL_GetMouse();
int show;
if (!mouse)
return 0;
show = (cur || !mouse->focus);
if (show) {
if (be_app->IsCursorHidden())
be_app->ShowCursor();
} else {
if (!be_app->IsCursorHidden())
be_app->HideCursor();
}
return 0;
}
static void HAIKU_MouseInit(_THIS)
{
SDL_Mouse *mouse = SDL_GetMouse();
if (!mouse)
return;
mouse->ShowCursor = HAIKU_ShowCursor;
mouse->cur_cursor = (SDL_Cursor*)0x1;
mouse->def_cursor = (SDL_Cursor*)0x2;
}
int HAIKU_VideoInit(_THIS) int HAIKU_VideoInit(_THIS)
{ {
/* Initialize the Be Application for appserver interaction */ /* Initialize the Be Application for appserver interaction */
@ -145,6 +173,8 @@ int HAIKU_VideoInit(_THIS)
/* Init the keymap */ /* Init the keymap */
HAIKU_InitOSKeymap(); HAIKU_InitOSKeymap();
HAIKU_MouseInit(_this);
#if SDL_VIDEO_OPENGL #if SDL_VIDEO_OPENGL
/* testgl application doesn't load library, just tries to load symbols */ /* testgl application doesn't load library, just tries to load symbols */
/* is it correct? if so we have to load library here */ /* is it correct? if so we have to load library here */