# HG changeset patch # User Sam Lantinga # Date 1159111902 0 # Node ID 678576473849423228202ae19a9f9ecb62bda286 # Parent 81f66f258d773947334f23374c668434af5f1c67 Fixed bug #286 Date: Thu, 9 Feb 2006 17:06:51 +0300 From: "Oleg K [BeSman]" Subject: BeOS SDL patches Hello all. My name is Oleg K. [BeSman], Im a BeOS user from Russia.This mail contain a BeOs-specific patches to SDL (implementation of InputGrabbing and mouse_relative mode). See the source in attached file for details. diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_BView.h --- a/src/video/bwindow/SDL_BView.h Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_BView.h Sun Sep 24 15:31:42 2006 +0000 @@ -37,22 +37,12 @@ BView(frame, "SDL View", B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS)) { image = NULL; - xoff = yoff = 0; SetViewColor(0,0,0,0); SetHighColor(0,0,0,0); } virtual ~SDL_BView() { SetBitmap(NULL); } - /* Set drawing offsets for fullscreen mode */ - virtual void SetXYOffset(int x, int y) { - xoff = x; - yoff = y; - } - virtual void GetXYOffset(int &x, int &y) { - x = xoff; - y = yoff; - } /* The view changed size. If it means we're in fullscreen, we * draw a nice black box in the entire view to get black borders. */ @@ -62,14 +52,14 @@ bounds.right = width; bounds.bottom = height; /* Fill the entire view with black */ - FillRect(bounds, B_SOLID_HIGH); +// FillRect(bounds, B_SOLID_HIGH); /* And if there's an image, redraw it. */ if( image ) { bounds = image->Bounds(); Draw(bounds); } } - + /* Drawing portion of this complete breakfast. :) */ virtual void SetBitmap(BBitmap *bitmap) { if ( image ) { @@ -79,34 +69,17 @@ } virtual void Draw(BRect updateRect) { if ( image ) { - if(xoff || yoff) { - BRect dest; - dest.top = updateRect.top + yoff; - dest.left = updateRect.left + xoff; - dest.bottom = updateRect.bottom + yoff; - dest.right = updateRect.right + xoff; - DrawBitmap(image, updateRect, dest); - } else { - DrawBitmap(image, updateRect, updateRect); - } + DrawBitmap(image, updateRect, updateRect); } } virtual void DrawAsync(BRect updateRect) { - if(xoff || yoff) { - BRect dest; - dest.top = updateRect.top + yoff; - dest.left = updateRect.left + xoff; - dest.bottom = updateRect.bottom + yoff; - dest.right = updateRect.right + xoff;; - DrawBitmapAsync(image, updateRect, dest); - } else { + if ( image ) { DrawBitmapAsync(image, updateRect, updateRect); } } private: BBitmap *image; - int xoff, yoff; }; #endif /* _SDL_BView_h */ diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_BWin.h --- a/src/video/bwindow/SDL_BWin.h Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_BWin.h Sun Sep 24 15:31:42 2006 +0000 @@ -40,6 +40,8 @@ extern "C" { #include "../../events/SDL_events_c.h" + +extern int mouse_relative; }; class SDL_BWin : public BDirectWindow @@ -47,9 +49,7 @@ public: SDL_BWin(BRect bounds) : BDirectWindow(bounds, "Untitled", B_TITLED_WINDOW, 0) { - InitKeyboard(); last_buttons = 0; - the_view = NULL; #if SDL_VIDEO_OPENGL SDL_GLView = NULL; @@ -82,118 +82,6 @@ } } - virtual void InitKeyboard(void) { - for ( uint i=0; iSetBitmap(bitmap); } - virtual void SetXYOffset(int x, int y) { -#if SDL_VIDEO_OPENGL - if ( the_view == SDL_GLView ) { - return; - } -#endif - SDL_View->SetXYOffset(x, y); - } - virtual void GetXYOffset(int &x, int &y) { -#if SDL_VIDEO_OPENGL - if ( the_view == SDL_GLView ) { - x = 0; - y = 0; - return; - } -#endif - SDL_View->GetXYOffset(x, y); - } virtual bool BeginDraw(void) { return(Lock()); } @@ -367,179 +237,7 @@ return unicode; } - virtual void DispatchMessage(BMessage *msg, BHandler *target) { - switch (msg->what) { - case B_MOUSE_MOVED: - { - BPoint where; - int32 transit; - if (msg->FindPoint("where", &where) == B_OK && msg->FindInt32("be:transit", &transit) == B_OK) { - if (transit == B_EXITED_VIEW) { - if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) { - SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - be_app->SetCursor(B_HAND_CURSOR); - } - } else { - int x, y; - if ( ! (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { - SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); - SDL_SetCursor(NULL); - } - GetXYOffset(x, y); - x = (int)where.x - x; - y = (int)where.y - y; - SDL_PrivateMouseMotion(0, 0, x, y); - } - } - break; - } - - case B_MOUSE_DOWN: - { - /* it looks like mouse down is send only for first clicked - button, each next is not send while last one is holded */ - int32 buttons; - int sdl_buttons = 0; - if (msg->FindInt32("buttons", &buttons) == B_OK) { - /* Add any mouse button events */ - if (buttons & B_PRIMARY_MOUSE_BUTTON) { - sdl_buttons |= SDL_BUTTON_LEFT; - } - if (buttons & B_SECONDARY_MOUSE_BUTTON) { - sdl_buttons |= SDL_BUTTON_RIGHT; - } - if (buttons & B_TERTIARY_MOUSE_BUTTON) { - sdl_buttons |= SDL_BUTTON_MIDDLE; - } - SDL_PrivateMouseButton(SDL_PRESSED, sdl_buttons, 0, 0); - - last_buttons = buttons; - } - break; - } - - case B_MOUSE_UP: - { - /* mouse up doesn't give which button was released, - only state of buttons (after release, so it's always = 0), - which is not what we need ;] - So we need to store button in mouse down, and restore - in mouse up :( - mouse up is (similarly to mouse down) send only for - first button down (ie. it's no send if we click another button - without releasing previous one first) - but that's probably - because of how drivers are written?, not BeOS itself. */ - int32 buttons; - int sdl_buttons = 0; - if (msg->FindInt32("buttons", &buttons) == B_OK) { - /* Add any mouse button events */ - if ((buttons ^ B_PRIMARY_MOUSE_BUTTON) & last_buttons) { - sdl_buttons |= SDL_BUTTON_LEFT; - } - if ((buttons ^ B_SECONDARY_MOUSE_BUTTON) & last_buttons) { - sdl_buttons |= SDL_BUTTON_RIGHT; - } - if ((buttons ^ B_TERTIARY_MOUSE_BUTTON) & last_buttons) { - sdl_buttons |= SDL_BUTTON_MIDDLE; - } - SDL_PrivateMouseButton(SDL_RELEASED, sdl_buttons, 0, 0); - - last_buttons = buttons; - } - break; - } - - case B_MOUSE_WHEEL_CHANGED: - { - float x, y; - x = y = 0; - if (msg->FindFloat("be:wheel_delta_x", &x) == B_OK && msg->FindFloat("be:wheel_delta_y", &y) == B_OK) { - if (x < 0 || y < 0) { - SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELDOWN, 0, 0); - SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELDOWN, 0, 0); - } else if (x > 0 || y > 0) { - SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELUP, 0, 0); - SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELUP, 0, 0); - } - } - break; - } - - case B_KEY_DOWN: - case B_UNMAPPED_KEY_DOWN: /* modifier keys are unmapped */ - { - int32 key; - int32 modifiers; - int32 key_repeat; - /* Workaround for SDL message queue being filled too fast because of BeOS own key-repeat mechanism */ - if (msg->FindInt32("be:key_repeat", &key_repeat) == B_OK && key_repeat > 0) - break; - - if (msg->FindInt32("key", &key) == B_OK && msg->FindInt32("modifiers", &modifiers) == B_OK) { - SDL_keysym keysym; - keysym.scancode = key; - if ((key > 0) && (key < 128)) { - keysym.sym = keymap[key]; - } else { - keysym.sym = SDLK_UNKNOWN; - } - /* FIX THIS? - it seems SDL_PrivateKeyboard() changes mod value - anyway, and doesn't care about what we setup here */ - keysym.mod = KMOD_NONE; - keysym.unicode = 0; - if (SDL_TranslateUNICODE) { - const char *bytes; - if (msg->FindString("bytes", &bytes) == B_OK) { - /* FIX THIS? - this cares only about first "letter", - so if someone maps some key to print - "BeOS rulez!" only "B" will be used. */ - keysym.unicode = Translate2Unicode(bytes); - } - } - SDL_PrivateKeyboard(SDL_PRESSED, &keysym); - } - break; - } - - case B_KEY_UP: - case B_UNMAPPED_KEY_UP: /* modifier keys are unmapped */ - { - int32 key; - int32 modifiers; - if (msg->FindInt32("key", &key) == B_OK && msg->FindInt32("modifiers", &modifiers) == B_OK) { - SDL_keysym keysym; - keysym.scancode = key; - if ((key > 0) && (key < 128)) { - keysym.sym = keymap[key]; - } else { - keysym.sym = SDLK_UNKNOWN; - } - keysym.mod = KMOD_NONE; /* FIX THIS? */ - keysym.unicode = 0; - if (SDL_TranslateUNICODE) { - const char *bytes; - if (msg->FindString("bytes", &bytes) == B_OK) { - keysym.unicode = Translate2Unicode(bytes); - } - } - SDL_PrivateKeyboard(SDL_RELEASED, &keysym); - } - break; - } - - default: - /* move it after switch{} so it's always handled - that way we keep BeOS feautures like: - - CTRL+Q to close window (and other shortcuts) - - PrintScreen to make screenshot into /boot/home - - etc.. */ - //BDirectWindow::DispatchMessage(msg, target); - break; - } - BDirectWindow::DispatchMessage(msg, target); - } + virtual void DispatchMessage(BMessage *msg, BHandler *target); private: #if SDL_VIDEO_OPENGL @@ -547,12 +245,9 @@ #endif SDL_BView *SDL_View; BView *the_view; - bool shown; bool inhibit_resize; - int32 last_buttons; - SDLKey keymap[128]; }; #endif /* _SDL_BWin_h */ diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_sysevents.cc --- a/src/video/bwindow/SDL_sysevents.cc Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_sysevents.cc Sun Sep 24 15:31:42 2006 +0000 @@ -29,6 +29,8 @@ #include "SDL_BWin.h" #include "SDL_lowvideo.h" +static SDLKey keymap[128]; +int mouse_relative = 0; extern "C" { #include "../../events/SDL_sysevents.h" @@ -41,6 +43,340 @@ void BE_InitOSKeymap(_THIS) { + for ( uint i=0; iwhat) { + case B_MOUSE_MOVED: + { + SDL_VideoDevice *view = current_video; + BPoint where; + int32 transit; + if (msg->FindPoint("where", &where) == B_OK && msg->FindInt32("be:transit", &transit) == B_OK) { + +//BeSman: I need another method for cursor catching !!! +if(view->input_grab != SDL_GRAB_OFF) +{ + BPoint center; + center.x = (SDL_VideoSurface->w/2); + center.y = (SDL_VideoSurface->h/2); + BPoint delta = where - center; +if(delta.x > center.x) +SDL_WarpMouse((int)center.x*2,(int)where.y); + +if(delta.x < -center.x) +SDL_WarpMouse(0,(int)where.y); + +if(delta.y > center.y) +SDL_WarpMouse((int)where.x,(int)center.y*2); + +if(delta.y < -center.y) +SDL_WarpMouse((int)where.x,0); + + +if((delta.x-1 < -center.x)&&(delta.y-1 < -center.y)) +SDL_WarpMouse(1,1); + +if((delta.x-1 < -center.x)&&(delta.y+1 > center.y)) +SDL_WarpMouse(1,(int)center.y*2-1); + +if((delta.x+1 > center.x)&&(delta.y-1 < -center.y)) +SDL_WarpMouse((int)center.x*2-1,1); + +if((delta.x+1 > center.x)&&(delta.y+1 > center.y)) +SDL_WarpMouse((int)center.x*2-1,(int)center.y*2-1); + +} + if (transit == B_EXITED_VIEW) { + if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) { + SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); + // be_app->SetCursor(B_HAND_CURSOR); + } + } else { + + int x, y; + if ( ! (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { + SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); + SDL_SetCursor(NULL); + } + x = (int)where.x; + y = (int)where.y; + + if ( mouse_relative ) { + BPoint center; + center.x = (SDL_VideoSurface->w/2); + center.y = (SDL_VideoSurface->h/2); + x -= (int)center.x; + y -= (int)center.y; + if ( x || y ) { + ConvertToScreen(¢er); + set_mouse_position((int)center.x, (int)center.y); + SDL_PrivateMouseMotion(0, 1, x, y); + } + } else { + SDL_PrivateMouseMotion(0, 0, x, y); + } + } + } + break; + } + + case B_MOUSE_DOWN: + { + /* it looks like mouse down is send only for first clicked + button, each next is not send while last one is holded */ + int32 buttons; + int sdl_buttons = 0; + if (msg->FindInt32("buttons", &buttons) == B_OK) { + /* Add any mouse button events */ + if (buttons & B_PRIMARY_MOUSE_BUTTON) { + sdl_buttons |= SDL_BUTTON_LEFT; + } + if (buttons & B_SECONDARY_MOUSE_BUTTON) { + sdl_buttons |= SDL_BUTTON_RIGHT; + } + if (buttons & B_TERTIARY_MOUSE_BUTTON) { + sdl_buttons |= SDL_BUTTON_MIDDLE; + } + SDL_PrivateMouseButton(SDL_PRESSED, sdl_buttons, 0, 0); + + last_buttons = buttons; + } + break; + } + + case B_MOUSE_UP: + { + /* mouse up doesn't give which button was released, + only state of buttons (after release, so it's always = 0), + which is not what we need ;] + So we need to store button in mouse down, and restore + in mouse up :( + mouse up is (similarly to mouse down) send only for + first button down (ie. it's no send if we click another button + without releasing previous one first) - but that's probably + because of how drivers are written?, not BeOS itself. */ + int32 buttons; + int sdl_buttons = 0; + if (msg->FindInt32("buttons", &buttons) == B_OK) { + /* Add any mouse button events */ + if ((buttons ^ B_PRIMARY_MOUSE_BUTTON) & last_buttons) { + sdl_buttons |= SDL_BUTTON_LEFT; + } + if ((buttons ^ B_SECONDARY_MOUSE_BUTTON) & last_buttons) { + sdl_buttons |= SDL_BUTTON_RIGHT; + } + if ((buttons ^ B_TERTIARY_MOUSE_BUTTON) & last_buttons) { + sdl_buttons |= SDL_BUTTON_MIDDLE; + } + SDL_PrivateMouseButton(SDL_RELEASED, sdl_buttons, 0, 0); + + last_buttons = buttons; + } + break; + } + + case B_MOUSE_WHEEL_CHANGED: + { + float x, y; + x = y = 0; + if (msg->FindFloat("be:wheel_delta_x", &x) == B_OK && msg->FindFloat("be:wheel_delta_y", &y) == B_OK) { + if (x < 0 || y < 0) { + SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELDOWN, 0, 0); + SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELDOWN, 0, 0); + } else if (x > 0 || y > 0) { + SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELUP, 0, 0); + SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELUP, 0, 0); + } + } + break; + } + + case B_KEY_DOWN: + case B_UNMAPPED_KEY_DOWN: /* modifier keys are unmapped */ + { + int32 key; + int32 modifiers; + int32 key_repeat; + /* Workaround for SDL message queue being filled too fast because of BeOS own key-repeat mechanism */ + if (msg->FindInt32("be:key_repeat", &key_repeat) == B_OK && key_repeat > 0) + break; + + if (msg->FindInt32("key", &key) == B_OK && msg->FindInt32("modifiers", &modifiers) == B_OK) { + SDL_keysym keysym; + keysym.scancode = key; + if (key < 128) { + keysym.sym = keymap[key]; + } else { + keysym.sym = SDLK_UNKNOWN; + } + /* FIX THIS? + it seems SDL_PrivateKeyboard() changes mod value + anyway, and doesn't care about what we setup here */ + keysym.mod = KMOD_NONE; + keysym.unicode = 0; + if (SDL_TranslateUNICODE) { + const char *bytes; + if (msg->FindString("bytes", &bytes) == B_OK) { + /* FIX THIS? + this cares only about first "letter", + so if someone maps some key to print + "BeOS rulez!" only "B" will be used. */ + keysym.unicode = Translate2Unicode(bytes); + } + } + SDL_PrivateKeyboard(SDL_PRESSED, &keysym); + } + break; + } + + case B_KEY_UP: + case B_UNMAPPED_KEY_UP: /* modifier keys are unmapped */ + { + int32 key; + int32 modifiers; + if (msg->FindInt32("key", &key) == B_OK && msg->FindInt32("modifiers", &modifiers) == B_OK) { + SDL_keysym keysym; + keysym.scancode = key; + if (key < 128) { + keysym.sym = keymap[key]; + } else { + keysym.sym = SDLK_UNKNOWN; + } + keysym.mod = KMOD_NONE; /* FIX THIS? */ + keysym.unicode = 0; + if (SDL_TranslateUNICODE) { + const char *bytes; + if (msg->FindString("bytes", &bytes) == B_OK) { + keysym.unicode = Translate2Unicode(bytes); + } + } + SDL_PrivateKeyboard(SDL_RELEASED, &keysym); + } + break; + } + + default: + /* move it after switch{} so it's always handled + that way we keep BeOS feautures like: + - CTRL+Q to close window (and other shortcuts) + - PrintScreen to make screenshot into /boot/home + - etc.. */ + //BDirectWindow::DispatchMessage(msg, target); + break; + } + BDirectWindow::DispatchMessage(msg, target); +} diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_sysmouse.cc --- a/src/video/bwindow/SDL_sysmouse.cc Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_sysmouse.cc Sun Sep 24 15:31:42 2006 +0000 @@ -27,7 +27,7 @@ #include "SDL_BWin.h" extern "C" { - +#include "SDL_cursor_c.h" #include "SDL_sysmouse_c.h" /* Convert bits to padded bytes */ @@ -128,11 +128,26 @@ /* Implementation by Christian Bauer */ void BE_WarpWMCursor(_THIS, Uint16 x, Uint16 y) { + if (_this->screen && (_this->screen->flags & SDL_FULLSCREEN) ) { + SDL_PrivateMouseMotion(0, 0, x, y); + } else { BPoint pt(x, y); SDL_Win->Lock(); SDL_Win->ConvertToScreen(&pt); SDL_Win->Unlock(); set_mouse_position((int32)pt.x, (int32)pt.y); + } +} +/* Check to see if we need to enter or leave mouse relative mode */ +void BE_CheckMouseMode(_THIS) +{ + /* If the mouse is hidden and input is grabbed, we use relative mode */ + if ( !(SDL_cursorstate & CURSOR_VISIBLE) && + (_this->input_grab != SDL_GRAB_OFF) ) { + mouse_relative = 1; + } else { + mouse_relative = 0; + } } }; /* Extern C */ diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_sysmouse_c.h --- a/src/video/bwindow/SDL_sysmouse_c.h Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_sysmouse_c.h Sun Sep 24 15:31:42 2006 +0000 @@ -29,4 +29,5 @@ Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y); extern int BE_ShowWMCursor(_THIS, WMcursor *cursor); extern void BE_WarpWMCursor(_THIS, Uint16 x, Uint16 y); +extern void BE_CheckMouseMode(_THIS); diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_sysvideo.cc --- a/src/video/bwindow/SDL_sysvideo.cc Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_sysvideo.cc Sun Sep 24 15:31:42 2006 +0000 @@ -135,7 +135,7 @@ device->SetCaption = BE_SetWMCaption; device->SetIcon = NULL; device->IconifyWindow = BE_IconifyWindow; - device->GrabInput = NULL; + device->GrabInput = BE_GrabInput; device->GetWMInfo = BE_GetWMInfo; /* Cursor manager functions */ device->FreeWMCursor = BE_FreeWMCursor; @@ -143,7 +143,7 @@ device->ShowWMCursor = BE_ShowWMCursor; device->WarpWMCursor = BE_WarpWMCursor; device->MoveWMCursor = NULL; - device->CheckMouseMode = NULL; + device->CheckMouseMode = BE_CheckMouseMode; /* Event manager functions */ device->InitOSKeymap = BE_InitOSKeymap; device->PumpEvents = BE_PumpEvents; @@ -365,8 +365,11 @@ if ( ! modes[i] || (modes[i]->w < width) || (modes[i]->h < width) ) { --i; /* We went too far */ } - width = modes[i]->w; - height = modes[i]->h; + +/* BeSman::We dont want to use a Desktop resolution */ +// width = modes[i]->w; +// height = modes[i]->h; + bscreen.GetModeList(&dmodes, &nmodes); for ( i = 0; i < nmodes; ++i ) { if ( (bpp == ColorSpaceToBitsPerPixel(dmodes[i].space)) && @@ -433,7 +436,7 @@ } if ( SDL_Win->Lock() ) { - int xoff, yoff; + int cx, cy; if ( SDL_Win->Shown() ) { needs_unlock = 1; SDL_Win->Hide(); @@ -449,19 +452,12 @@ /* Calculate offsets - used either to center window * (windowed mode) or to set drawing offsets (fullscreen mode) */ - xoff = (bounds.IntegerWidth() - width)/2; - yoff = (bounds.IntegerHeight() - height)/2; - if ( fullscreen ) { - /* Set offset for drawing */ - SDL_Win->SetXYOffset(xoff, yoff); - } else { - /* Center window and reset the drawing offset */ - SDL_Win->SetXYOffset(0, 0); - } + cx = (bounds.IntegerWidth() - width)/2; + cy = (bounds.IntegerHeight() - height)/2; + if ( ! needs_unlock || was_fullscreen ) { /* Center the window the first time */ - SDL_Win->MoveTo(xoff > 0 ? (float)xoff : 0.0f, - yoff > 0 ? (float)yoff : 0.0f); + SDL_Win->MoveTo(cx, cy); } SDL_Win->Show(); diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_syswm.cc --- a/src/video/bwindow/SDL_syswm.cc Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_syswm.cc Sun Sep 24 15:31:42 2006 +0000 @@ -24,9 +24,9 @@ #include "SDL_BWin.h" extern "C" { - #include "SDL_syswm_c.h" #include "SDL_error.h" +#include "../SDL_cursor_c.h" void BE_SetWMCaption(_THIS, const char *title, const char *icon) { @@ -38,6 +38,42 @@ SDL_Win->Minimize(true); } +SDL_GrabMode BE_GrabInput(_THIS, SDL_GrabMode mode) +{ + if ( mode == SDL_GRAB_OFF ) { +// be_app->ShowCursor(); + if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) { + /* BeSman: Jan 2, 2006 + must be leaving relative mode, move mouse from + center of window to where it belongs ... */ + BPoint pt; + int x, y; + SDL_GetMouseState(&x,&y); + pt.x = x; + pt.y = y; + SDL_Win->Lock(); + SDL_Win->ConvertToScreen(&pt); + SDL_Win->Unlock(); + set_mouse_position((int)pt.x, (int)pt.y); + } + } else { +// be_app->HideCursor(); + if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) { + /* BeSman: Jan 2, 2006 + must be entering relative mode, get ready by + moving mouse to center of window ... */ + BPoint pt; + pt.x = (SDL_VideoSurface->w/2); + pt.y = (SDL_VideoSurface->h/2); + SDL_Win->Lock(); + SDL_Win->ConvertToScreen(&pt); + SDL_Win->Unlock(); + set_mouse_position((int)pt.x, (int)pt.y); + } + } + return(mode); +} + int BE_GetWMInfo(_THIS, SDL_SysWMinfo *info) { if (info->version.major <= SDL_MAJOR_VERSION) diff -r 81f66f258d77 -r 678576473849 src/video/bwindow/SDL_syswm_c.h --- a/src/video/bwindow/SDL_syswm_c.h Sun Sep 24 01:27:40 2006 +0000 +++ b/src/video/bwindow/SDL_syswm_c.h Sun Sep 24 15:31:42 2006 +0000 @@ -29,3 +29,4 @@ extern void BE_SetWMCaption(_THIS, const char *title, const char *icon); extern int BE_IconifyWindow(_THIS); extern int BE_GetWMInfo(_THIS, SDL_SysWMinfo *info); +extern SDL_GrabMode BE_GrabInput(_THIS, SDL_GrabMode mode); \ No newline at end of file