Mercurial > sdl-ios-xcode
annotate src/video/bwindow/SDL_BWin.h @ 906:a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
From: Marcin Konicki
Subject: [PATCH] Add missing functions and bring back OpenGL
This patch adds missing functions:
IconifyWindow
GetWMInfo
GL_LoadLibrary
GL_GetProcAddress
GL_GetAttribute
GL_MakeCurrent
Adding GL_* functions brings back working OpenGL in SDL for BeOS :).
With addd GL_* functions there are few changes in Window class to handle
changes better.
Patch also fixes bug which freezed window when using MesaGL instead of
BeOS r5 GL - it just needed Window->Quit() added into BE_VideoQuit().
THX to Michael Weirauch (a.k.a emwe) who worked on that bug before and
found that it freezes because of lock somewhere.
THX to Matti "Mictlantecuhtli" Lev��nen for testing, Rod��ric Vicaire
(a.k.a. Ingenu) for OpenGL wisdom, and Stefano Ceccherini (a.k.a Jack
Burton) for asking me to fix SDL on BeOS :).
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 18 Jul 2004 19:14:33 +0000 |
| parents | b8d311d90021 |
| children | 3bd4d7a1ee04 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
1
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #ifndef _SDL_BWin_h | |
| 29 #define _SDL_BWin_h | |
| 30 | |
| 31 #include <stdio.h> | |
| 32 #include <AppKit.h> | |
| 33 #include <InterfaceKit.h> | |
| 34 #include <be/game/DirectWindow.h> | |
| 35 #ifdef HAVE_OPENGL | |
| 36 #include <be/opengl/GLView.h> | |
| 37 #endif | |
| 38 | |
| 39 #include "SDL_BeApp.h" | |
| 40 #include "SDL_events.h" | |
| 41 #include "SDL_BView.h" | |
| 42 | |
| 43 extern "C" { | |
| 44 #include "SDL_events_c.h" | |
| 45 }; | |
| 46 | |
| 47 class SDL_BWin : public BDirectWindow | |
| 48 { | |
| 49 public: | |
| 50 SDL_BWin(BRect bounds) : | |
| 51 BDirectWindow(bounds, "Untitled", B_TITLED_WINDOW, 0) { | |
| 52 the_view = NULL; | |
| 53 #ifdef HAVE_OPENGL | |
| 54 SDL_GLView = NULL; | |
| 55 #endif | |
| 56 SDL_View = NULL; | |
| 57 Unlock(); | |
| 58 shown = false; | |
| 59 inhibit_resize = false; | |
| 60 } | |
| 61 virtual ~SDL_BWin() { | |
| 62 Lock(); | |
| 63 if ( the_view ) { | |
| 64 #ifdef HAVE_OPENGL | |
| 65 if ( the_view == SDL_GLView ) { | |
| 66 SDL_GLView->UnlockGL(); | |
| 67 } | |
| 68 #endif | |
| 69 RemoveChild(the_view); | |
| 70 the_view = NULL; | |
| 71 } | |
| 72 Unlock(); | |
| 73 #ifdef HAVE_OPENGL | |
| 74 if ( SDL_GLView ) { | |
| 75 delete SDL_GLView; | |
| 76 } | |
| 77 #endif | |
| 78 if ( SDL_View ) { | |
| 79 delete SDL_View; | |
| 80 } | |
| 81 } | |
| 82 | |
| 83 /* Override the Show() method so we can tell when we've been shown */ | |
| 84 virtual void Show(void) { | |
| 85 BWindow::Show(); | |
| 86 shown = true; | |
| 87 } | |
| 88 virtual bool Shown(void) { | |
| 89 return (shown); | |
| 90 } | |
| 91 /* If called, the next resize event will not be forwarded to SDL. */ | |
| 92 virtual void InhibitResize(void) { | |
| 93 inhibit_resize=true; | |
| 94 } | |
| 95 /* Handle resizing of the window */ | |
| 96 virtual void FrameResized(float width, float height) { | |
| 97 if(inhibit_resize) | |
| 98 inhibit_resize = false; | |
| 99 else | |
| 100 SDL_PrivateResize((int)width, (int)height); | |
| 101 } | |
|
906
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
102 virtual int CreateView(Uint32 flags, Uint32 gl_flags) { |
| 0 | 103 int retval; |
| 104 | |
| 105 retval = 0; | |
| 106 Lock(); | |
| 107 if ( flags & SDL_OPENGL ) { | |
| 108 #ifdef HAVE_OPENGL | |
| 109 if ( SDL_GLView == NULL ) { | |
| 110 SDL_GLView = new BGLView(Bounds(), "SDL GLView", | |
|
906
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
111 B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS), |
|
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
112 gl_flags); |
| 0 | 113 } |
| 114 if ( the_view != SDL_GLView ) { | |
| 115 if ( the_view ) { | |
| 116 RemoveChild(the_view); | |
| 117 } | |
| 118 AddChild(SDL_GLView); | |
| 119 SDL_GLView->LockGL(); | |
| 120 the_view = SDL_GLView; | |
| 121 } | |
| 122 #else | |
| 123 SDL_SetError("OpenGL support not enabled"); | |
| 124 retval = -1; | |
| 125 #endif | |
| 126 } else { | |
| 127 if ( SDL_View == NULL ) { | |
| 128 SDL_View = new SDL_BView(Bounds()); | |
| 129 } | |
| 130 if ( the_view != SDL_View ) { | |
| 131 if ( the_view ) { | |
| 132 #ifdef HAVE_OPENGL | |
| 133 if ( the_view == SDL_GLView ) { | |
| 134 SDL_GLView->UnlockGL(); | |
| 135 } | |
| 136 #endif | |
| 137 RemoveChild(the_view); | |
| 138 } | |
| 139 AddChild(SDL_View); | |
| 140 the_view = SDL_View; | |
| 141 } | |
| 142 } | |
| 143 Unlock(); | |
| 144 return(retval); | |
| 145 } | |
| 146 virtual void SetBitmap(BBitmap *bitmap) { | |
| 147 SDL_View->SetBitmap(bitmap); | |
| 148 } | |
| 149 virtual void SetXYOffset(int x, int y) { | |
| 150 #ifdef HAVE_OPENGL | |
| 151 if ( the_view == SDL_GLView ) { | |
| 152 return; | |
| 153 } | |
| 154 #endif | |
| 155 SDL_View->SetXYOffset(x, y); | |
| 156 } | |
|
1
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
157 virtual void GetXYOffset(int &x, int &y) { |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
158 #ifdef HAVE_OPENGL |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
159 if ( the_view == SDL_GLView ) { |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
160 x = 0; |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
161 y = 0; |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
162 return; |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
163 } |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
164 #endif |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
165 SDL_View->GetXYOffset(x, y); |
|
cf2af46e9e2a
Changes since SDL 1.2.0 release
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
166 } |
| 0 | 167 virtual bool BeginDraw(void) { |
| 168 return(Lock()); | |
| 169 } | |
| 170 virtual void DrawAsync(BRect updateRect) { | |
| 171 SDL_View->DrawAsync(updateRect); | |
| 172 } | |
| 173 virtual void EndDraw(void) { | |
| 174 SDL_View->Sync(); | |
| 175 Unlock(); | |
| 176 } | |
| 177 #ifdef HAVE_OPENGL | |
| 178 virtual void SwapBuffers(void) { | |
| 179 SDL_GLView->UnlockGL(); | |
| 180 SDL_GLView->LockGL(); | |
| 181 SDL_GLView->SwapBuffers(); | |
| 182 } | |
| 183 #endif | |
| 184 virtual BView *View(void) { | |
| 185 return(the_view); | |
| 186 } | |
| 187 | |
| 188 /* Hook functions -- overridden */ | |
| 189 virtual void Minimize(bool minimize) { | |
| 190 /* This is only called when mimimized, not when restored */ | |
| 191 //SDL_PrivateAppActive(minimize, SDL_APPACTIVE); | |
| 192 BWindow::Minimize(minimize); | |
| 193 } | |
| 194 virtual void WindowActivated(bool active) { | |
| 195 SDL_PrivateAppActive(active, SDL_APPINPUTFOCUS); | |
| 196 } | |
| 197 virtual bool QuitRequested(void) { | |
| 198 if ( SDL_BeAppActive > 0 ) { | |
| 199 SDL_PrivateQuit(); | |
| 200 /* We don't ever actually close the window here because | |
| 201 the application should respond to the quit request, | |
| 202 or ignore it as desired. | |
| 203 */ | |
| 204 return(false); | |
| 205 } | |
| 206 return(true); /* Close the app window */ | |
| 207 } | |
|
906
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
208 virtual void Quit() { |
|
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
209 if (!IsLocked()) |
|
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
210 Lock(); |
|
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
211 BDirectWindow::Quit(); |
|
a48acf6ee48f
Date: Sat, 03 Jul 2004 02:23:48 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
212 } |
| 0 | 213 |
| 214 private: | |
| 215 #ifdef HAVE_OPENGL | |
| 216 BGLView *SDL_GLView; | |
| 217 #endif | |
| 218 SDL_BView *SDL_View; | |
| 219 BView *the_view; | |
| 220 | |
| 221 bool shown; | |
| 222 bool inhibit_resize; | |
| 223 }; | |
| 224 | |
| 225 #endif /* _SDL_BWin_h */ |