Mercurial > sdl-ios-xcode

diff src/video/qtopia/SDL_sysvideo.cc @ 379:11c8a7684f74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Fri, 24 May 2002 10:32:00 -0700 From: David Hedbor <david@hedbor.org> Subject: more patches Ok, another thing I discovered when porting prboom to the Zaurus - mouse events weren't rotated when the screen was (i.e you got incorrect events there). This is now fixed. Also noticed that SDL_WarpMouse isn't handled correctly, but I haven't looked at fixing that yes.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 28 May 2002 19:24:11 +0000
parents db0cc6034336
children c96e2137f9eb
line wrap: on
line diff
--- a/src/video/qtopia/SDL_sysvideo.cc	Mon May 20 18:36:48 2002 +0000
+++ b/src/video/qtopia/SDL_sysvideo.cc	Tue May 28 19:24:11 2002 +0000
@@ -34,12 +34,12 @@
 #include <unistd.h>
 
 #include <qapplication.h>
+#include <qpe/qpeapplication.h>
 
 #include "SDL.h"
 #include "SDL_timer.h"
 
 #include "SDL_QWin.h"
-#include "SDL_QPEApp.h"
 
 extern "C" {
 
@@ -213,10 +213,6 @@
   int QT_VideoInit(_THIS, SDL_PixelFormat *vformat)
   {
     /* Initialize the QPE Application  */
-    if(SDL_InitQPEApp() == -1) {
-      return -1;
-    }
-
      /* Determine the screen depth */
     vformat->BitsPerPixel = QPixmap::defaultDepth();
 
@@ -231,7 +227,7 @@
 
     /* Create the window / widget */
     SDL_Win = new SDL_QWin(QSize(QT_HIDDEN_SIZE, QT_HIDDEN_SIZE));
-    qApp->setMainWidget(SDL_Win);
+    ((QPEApplication*)qApp)->showMainWidget(SDL_Win);
     /* Fill in some window manager capabilities */
     _this->info.wm_available = 0;
 
@@ -274,7 +270,7 @@
   SDL_Surface *QT_SetVideoMode(_THIS, SDL_Surface *current,
 			       int width, int height, int bpp, Uint32 flags)
   {
-    Qt::WFlags wflags = Qt::WType_TopLevel|Qt::WStyle_Customize;
+
     QImage *qimage;
     QSize desktop_size = qApp->desktop()->size();
 
@@ -367,9 +363,13 @@
 
   void QT_VideoQuit(_THIS)
   {
-    qApp->setMainWidget(0);
-    delete SDL_Win;
-    SDL_QuitQPEApp();
+    // This is dumb, but if I free this, the app doesn't exit correctly.
+    // Of course, this will leak memory if init video is done more than once.
+    // Sucks but such is life.
+    
+    //    -- David Hedbor
+    //    delete SDL_Win; 
+    //    SDL_Win = 0;
     _this->screen->pixels = NULL;
   }