Mercurial > sdl-ios-xcode

diff src/video/photon/SDL_ph_video.c @ 283:3d8b6b9f1e18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Mon, 18 Feb 2002 16:46:59 +1200 From: Julian Kinraid <jkinraid@clear.net.nz> Subject: Patches for photon port of SDL Hi, A couple more patches for photon and the nto audio. Adds mouse grabbing support, fixed cursor images, unicode keyboard events (though no unicode data on kye release, is that a problem?), hopefully fixing some audio lag problems, and a few other fixes. Thanks, Julian Kinraid
author Sam Lantinga <slouken@libsdl.org>
date Wed, 20 Feb 2002 01:05:51 +0000
parents 04351f59b051
children 68a8a8237c09
line wrap: on
line diff
--- a/src/video/photon/SDL_ph_video.c	Wed Feb 20 01:02:33 2002 +0000
+++ b/src/video/photon/SDL_ph_video.c	Wed Feb 20 01:05:51 2002 +0000
@@ -111,7 +111,7 @@
     device->SetCaption = ph_SetCaption;
     device->SetIcon = NULL;
     device->IconifyWindow = ph_IconifyWindow;
-    device->GrabInput = NULL;
+    device->GrabInput = ph_GrabInput;
     device->GetWMInfo = NULL;
     device->FreeWMCursor = ph_FreeWMCursor;
     device->CreateWMCursor = ph_CreateWMCursor;
@@ -329,7 +329,7 @@
 
 		/* Get the true height and width */
 		
-      current->flags = (flags|(~SDL_RESIZABLE)); /* no resize for Direct Context */
+      current->flags = (flags & (~SDL_RESIZABLE)); /* no resize for Direct Context */
 
 		 /* Begin direct mode */
 		 ph_EnterFullScreen(this);
@@ -342,11 +342,11 @@
        if (flags & SDL_HWSURFACE)  /* Use offscreen memory iff SDL_HWSURFACE flag is set */
        {
          /* Hardware surface is Offsceen Context.  ph_ResizeImage handles the switch */
-         current->flags = (flags|(~SDL_RESIZABLE)); /* no stretch blit in offscreen context */
+         current->flags = (flags & (~SDL_RESIZABLE)); /* no stretch blit in offscreen context */
        }
        else /* must be SDL_SWSURFACE */
        {
-          current->flags = (flags|SDL_RESIZABLE); /* yes we can resize as this is a software surface */
+          current->flags = (flags | SDL_RESIZABLE); /* yes we can resize as this is a software surface */
        }
 
 #ifdef HAVE_OPENGL       
@@ -415,10 +415,7 @@
 
 static void ph_VideoQuit(_THIS)
 {
-    if (SDL_Image != NULL)
-    {
-        ph_DestroyImage(this, SDL_VideoSurface); 
-    }
+    ph_DestroyImage(this, SDL_VideoSurface); 
 
     if (currently_fullscreen)
     {