Mercurial > sdl-ios-xcode

diff src/video/photon/SDL_ph_video.c @ 19:8cc4dbfab9ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Thu, 19 Apr 2001 08:36:54 +0300 From: "Mike Gorchak" <mike@malva.com.ua> Subject: Patches for QNX RtP Here my patch for QNX RtP/Photon for SDL-1.2. Detailed description of my changes: SDL/configure.in: If Photon detected declare define ENABLE_PHOTON. SDL/src/video/SDL_sysvideo.h: Added extern to ph_bootstrap. SDL/src/video/SDL_video.c: Added ph_bootstrap to bootstrap array. SDL/src/video/photon/SDL_ph_events.c: Declare DISABLE_X11 if compiled for Photon. SDL/src/video/photon/SDL_ph_image.c: Fixed segment violation on exit. Please update BUGS file. SDL/src/video/photon/SDL_ph_video.c: 1. Enabling window manager. 2. Added to device capabilities Photon Window Manager functions: SetCaption and IconifyWindow. 3. Renamed X11_bootstrap to ph_bootstrap. 4. Removed SEGFAULT termination of programs if Photon not available. SDL/src/video/photon/SDL_ph_wm.c: 1. Declare DISABLE_X11 if compiled for Photon. 2. Added ph_SetCaption and ph_IconifyWindow code. (Thanks to 'phearbear' for iconify window source). 3. Some stubers for other wm functions. Thanks ! ---------------------------- Mike Gorchak CJSC Malva System Programmer
author Sam Lantinga <slouken@lokigames.com>
date Thu, 10 May 2001 18:42:17 +0000
parents 74212992fb08
children 62bad9a82022
line wrap: on
line diff
--- a/src/video/photon/SDL_ph_video.c	Thu May 10 18:31:21 2001 +0000
+++ b/src/video/photon/SDL_ph_video.c	Thu May 10 18:42:17 2001 +0000
@@ -46,6 +46,7 @@
 #include "SDL_ph_image_c.h"
 #include "SDL_ph_events_c.h"
 #include "SDL_ph_mouse_c.h"
+#include "SDL_ph_wm_c.h"
 #include "SDL_phyuv_c.h"
 #include "blank_cursor.h"
 
@@ -103,9 +104,9 @@
     device->UnlockHWSurface = ph_UnlockHWSurface;
     device->FlipHWSurface = ph_FlipHWSurface;
     device->FreeHWSurface = ph_FreeHWSurface;
-    device->SetCaption = NULL;
+    device->SetCaption = ph_SetCaption;
     device->SetIcon = NULL;
-    device->IconifyWindow = NULL;
+    device->IconifyWindow = ph_IconifyWindow;
     device->GrabInput = NULL;
     device->GetWMInfo = NULL;
     device->FreeWMCursor = ph_FreeWMCursor;
@@ -121,7 +122,7 @@
     return device;
 }
 
-VideoBootStrap X11_bootstrap = {
+VideoBootStrap ph_bootstrap = {
         "photon", "QNX Photon video output",
 	ph_Available, ph_CreateDevice
 };
@@ -183,8 +184,9 @@
 
   	if(window == NULL)
   	{
-  		printf("PtAppInit failed\n");
-        PtExit(EXIT_FAILURE);
+  		printf("Photon application init failed, probably Photon is not running.\n");
+        	exit( EXIT_FAILURE );
+//        PtExit(EXIT_FAILURE);         // Got SEGFAULT.
   	}
 
     //PgSetDrawBufferSize(16 *1024);
@@ -244,7 +246,10 @@
 		}
 
 
-	currently_fullscreen = 0;
+    currently_fullscreen = 0;
+    
+    this->info.wm_available = 1;
+    
     return 0;
 }