Ticket #522: SDL-1.2-HG-2010-12-27_opengl_cursor_patch.diff

src/events/SDL_quit.c

@@ -45 +45 @@
 /* Public functions */
 int SDL_QuitInit(void)
 {
-#ifdef HAVE_SIGACTION
+#if defined(HAVE_SIGACTION) && !defined(__HAIKU__)
         struct sigaction action;
         sigaction(SIGINT, NULL, &action);
         if ( action.sa_handler == SIG_DFL && action.sa_sigaction == (void*)SIG_DFL ) {

src/video/SDL_cursor.c

@@ -729 +729 @@
         if ( SDL_MUSTLOCK(screen) ) {
                 SDL_UnlockSurface(screen);
         }
+        
         if ( (screen == SDL_VideoSurface) &&
              ((screen->flags & SDL_HWSURFACE) != SDL_HWSURFACE) ) {
                 SDL_VideoDevice *video = current_video;

src/video/bwindow/SDL_BWin.h

@@ -112 +112 @@
                         if ( SDL_GLView == NULL ) {
                                 SDL_GLView = new BGLView(Bounds(), "SDL GLView",
                                                 B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS),
-                                                gl_flags);
+                                                gl_flags|BGL_DOUBLE);
                                 SDL_GLView->EnableDirectMode(true);
                         }
                         if ( the_view != SDL_GLView ) {
@@ -133 +133 @@
                         }
                         if ( the_view != SDL_View ) {
                                 if ( the_view ) {
-#if SDL_VIDEO_OPENGL
-                                        if ( the_view == SDL_GLView ) {
-                                                SDL_GLView->UnlockGL();
-                                        }
-#endif
                                         RemoveChild(the_view);
                                 }
                                 AddChild(SDL_View);
                                 the_view = SDL_View;
                         }
                 }
+#if SDL_VIDEO_OPENGL
+                if ( the_view == SDL_GLView ) {
+                        SDL_GLView->UnlockGL();
+                }
+#endif
                 Unlock();
                 return(retval);
         }
@@ -191 +191 @@
 #if SDL_VIDEO_OPENGL
         virtual void SwapBuffers(void) {
                 SDL_GLView->UnlockGL();
-                SDL_GLView->LockGL();
                 SDL_GLView->SwapBuffers();
+                SDL_GLView->LockGL();
         }
 #endif
         virtual BView *View(void) {
@@ -215 +215 @@
                            the application should respond to the quit request,
                            or ignore it as desired.
                          */
+#if SDL_VIDEO_OPENGL
+                        if ( SDL_GLView != NULL ) {
+                                SDL_GLView->EnableDirectMode(false);
+                        }
+#endif
                         return(false);
                 }
                 return(true);   /* Close the app window */

src/video/bwindow/SDL_sysevents.cc

@@ -36 +36 @@
 #include "../../events/SDL_sysevents.h"
 #include "../../events/SDL_events_c.h"
 #include "SDL_sysevents_c.h"
+#include "../SDL_cursor_c.h"
 
 void BE_PumpEvents(_THIS)
 {
@@ -203 +204 @@
                                 if (transit == B_EXITED_VIEW) {
                                         if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) {
                                                 SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+#if SDL_VIDEO_OPENGL
+                                        // for some reason, SDL_EraseCursor fails for OpenGL
+                                        if (this->the_view != this->SDL_GLView)
+#endif
+                                                        SDL_EraseCursor(SDL_VideoSurface);
                                                 be_app->SetCursor(B_HAND_CURSOR);
                                         }
                                 } else {
                                         if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
                                                 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+#if SDL_VIDEO_OPENGL
+                                        // for some reason, SDL_EraseCursor fails for OpenGL
+                                        if (this->the_view != this->SDL_GLView)
+#endif
+                                                        SDL_EraseCursor(SDL_VideoSurface);
                                                 SDL_SetCursor(NULL);
                                         }
 
@@ -395 +406 @@
                 default:
                         break;
         }
+#if SDL_VIDEO_OPENGL
+        // If it is a BGLView, it is apparently required to
+        // call DirectConnected() on it as well
+        if (this->the_view == this->SDL_GLView)
+                this->SDL_GLView->DirectConnected(info);
+#endif  
 }