Haiku: use a BLooper for events. only create a BApplication when it doesn't already exist.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 363606c..0368081 100644
--- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h
@@ -49,6 +49,7 @@ extern "C" {
#include <vector>
/* Forward declarations */
+class SDL_BLooper;
class SDL_BWin;
/* Message constants */
@@ -74,32 +75,25 @@ enum ToSDL
BAPP_SCREEN_CHANGED
};
-/* Create a descendant of BApplication */
-class SDL_BApp : public BApplication
+
+extern "C" SDL_BLooper *SDL_Looper;
+
+
+/* Create a descendant of BLooper */
+class SDL_BLooper : public BLooper
{
public:
- SDL_BApp(const char *signature) : BApplication(signature)
+ SDL_BLooper(const char* name) : BLooper(name)
{
#if SDL_VIDEO_OPENGL
_current_context = NULL;
#endif
}
- virtual ~SDL_BApp()
+ virtual ~SDL_BLooper()
{
}
- virtual void RefsReceived(BMessage *message)
- {
- char filePath[512];
- entry_ref entryRef;
- for (int32 i = 0; message->FindRef("refs", i, &entryRef) == B_OK; i++) {
- BPath referencePath = BPath(&entryRef);
- SDL_SendDropFile(NULL, referencePath.Path());
- }
- return;
- }
-
/* Event-handling functions */
virtual void MessageReceived(BMessage *message)
{
@@ -170,7 +164,7 @@ class SDL_BApp : public BApplication
break;
default:
- BApplication::MessageReceived(message);
+ BLooper::MessageReceived(message);
break;
}
}
diff --git a/src/main/haiku/SDL_BeApp.cc b/src/main/haiku/SDL_BeApp.cc
index 9fbffcb..f1cf482 100644
--- a/src/main/haiku/SDL_BeApp.cc
+++ b/src/main/haiku/SDL_BeApp.cc
@@ -31,7 +31,7 @@
#include <storage/File.h>
#include <unistd.h>
-#include "SDL_BApp.h" /* SDL_BApp class definition */
+#include "SDL_BApp.h" /* SDL_BLooper class definition */
#include "SDL_BeApp.h"
#include "SDL_timer.h"
#include "SDL_error.h"
@@ -44,12 +44,38 @@ extern "C" {
#include "../../thread/SDL_systhread.h"
-/* Flag to tell whether or not the Be application is active or not */
+/* Flag to tell whether or not the Be application and looper are active or not */
static int SDL_BeAppActive = 0;
static SDL_Thread *SDL_AppThread = NULL;
+SDL_BLooper *SDL_Looper = NULL;
+
/* Default application signature */
-const char *signature = "application/x-SDL-executable";
+const char *SDL_signature = "application/x-SDL-executable";
+
+
+/* Create a descendant of BApplication */
+class SDL_BApp : public BApplication {
+public:
+ SDL_BApp(const char* signature) :
+ BApplication(signature) {
+ }
+
+
+ virtual ~SDL_BApp() {
+ }
+
+
+ virtual void RefsReceived(BMessage* message) {
+ entry_ref entryRef;
+ for (int32 i = 0; message->FindRef("refs", i, &entryRef) == B_OK; i++) {
+ BPath referencePath = BPath(&entryRef);
+ SDL_SendDropFile(NULL, referencePath.Path());
+ }
+ return;
+ }
+};
+
static int StartBeApp(void *unused)
{
@@ -65,48 +91,62 @@ static int StartBeApp(void *unused)
if (app_info.InitCheck() == B_OK) {
char sig[B_MIME_TYPE_LENGTH];
if (app_info.GetSignature(sig) == B_OK) {
- signature = strndup(sig, B_MIME_TYPE_LENGTH);
+ SDL_signature = strndup(sig, B_MIME_TYPE_LENGTH);
}
}
}
}
- App = new SDL_BApp(signature);
+ App = new SDL_BApp(SDL_signature);
App->Run();
delete App;
return 0;
}
-/* Initialize the Be Application, if it's not already started */
-int
-SDL_InitBeApp(void)
+
+static int
+StartBeLooper()
{
- /* Create the BApplication that handles appserver interaction */
- if (SDL_BeAppActive <= 0) {
+ if (!be_app) {
SDL_AppThread = SDL_CreateThreadInternal(StartBeApp, "SDLApplication", 0, NULL);
if (SDL_AppThread == NULL) {
return SDL_SetError("Couldn't create BApplication thread");
}
- /* Change working directory to that of executable */
- app_info info;
- if (B_OK == be_app->GetAppInfo(&info)) {
- entry_ref ref = info.ref;
- BEntry entry;
- if (B_OK == entry.SetTo(&ref)) {
- BPath path;
- if (B_OK == path.SetTo(&entry)) {
- if (B_OK == path.GetParent(&path)) {
- chdir(path.Path());
- }
+ do {
+ SDL_Delay(10);
+ } while ((be_app == NULL) || be_app->IsLaunching());
+ }
+
+ /* Change working directory to that of executable */
+ app_info info;
+ if (B_OK == be_app->GetAppInfo(&info)) {
+ entry_ref ref = info.ref;
+ BEntry entry;
+ if (B_OK == entry.SetTo(&ref)) {
+ BPath path;
+ if (B_OK == path.SetTo(&entry)) {
+ if (B_OK == path.GetParent(&path)) {
+ chdir(path.Path());
}
}
}
+ }
- do {
- SDL_Delay(10);
- } while ((be_app == NULL) || be_app->IsLaunching());
+ SDL_Looper = new SDL_BLooper("SDLLooper");
+ SDL_Looper->Run();
+ return (0);
+}
+
+
+/* Initialize the Be Application, if it's not already started */
+int
+SDL_InitBeApp(void)
+{
+ /* Create the BApplication that handles appserver interaction */
+ if (SDL_BeAppActive <= 0) {
+ StartBeLooper();
/* Mark the application active */
SDL_BeAppActive = 0;
@@ -128,6 +168,9 @@ SDL_QuitBeApp(void)
/* If the reference count reached zero, clean up the app */
if (SDL_BeAppActive == 0) {
+ SDL_Looper->Lock();
+ SDL_Looper->Quit();
+ SDL_Looper = NULL;
if (SDL_AppThread != NULL) {
if (be_app != NULL) { /* Not tested */
be_app->PostMessage(B_QUIT_REQUESTED);
@@ -144,7 +187,7 @@ SDL_QuitBeApp(void)
#endif
/* SDL_BApp functions */
-void SDL_BApp::ClearID(SDL_BWin *bwin) {
+void SDL_BLooper::ClearID(SDL_BWin *bwin) {
_SetSDLWindow(NULL, bwin->GetID());
int32 i = _GetNumWindowSlots() - 1;
while (i >= 0 && GetSDLWindow(i) == NULL) {
diff --git a/src/main/haiku/SDL_BeApp.h b/src/main/haiku/SDL_BeApp.h
index 819fa39..9a5adb8 100644
--- a/src/main/haiku/SDL_BeApp.h
+++ b/src/main/haiku/SDL_BeApp.h
@@ -32,7 +32,7 @@ extern int SDL_InitBeApp(void);
extern void SDL_QuitBeApp(void);
/* Be Application Signature*/
-extern const char *signature;
+extern const char *SDL_signature;
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_BApp.h b/src/video/haiku/SDL_BApp.h
index 363606c..0368081 100644
--- a/src/video/haiku/SDL_BApp.h
+++ b/src/video/haiku/SDL_BApp.h
@@ -49,6 +49,7 @@ extern "C" {
#include <vector>
/* Forward declarations */
+class SDL_BLooper;
class SDL_BWin;
/* Message constants */
@@ -74,32 +75,25 @@ enum ToSDL
BAPP_SCREEN_CHANGED
};
-/* Create a descendant of BApplication */
-class SDL_BApp : public BApplication
+
+extern "C" SDL_BLooper *SDL_Looper;
+
+
+/* Create a descendant of BLooper */
+class SDL_BLooper : public BLooper
{
public:
- SDL_BApp(const char *signature) : BApplication(signature)
+ SDL_BLooper(const char* name) : BLooper(name)
{
#if SDL_VIDEO_OPENGL
_current_context = NULL;
#endif
}
- virtual ~SDL_BApp()
+ virtual ~SDL_BLooper()
{
}
- virtual void RefsReceived(BMessage *message)
- {
- char filePath[512];
- entry_ref entryRef;
- for (int32 i = 0; message->FindRef("refs", i, &entryRef) == B_OK; i++) {
- BPath referencePath = BPath(&entryRef);
- SDL_SendDropFile(NULL, referencePath.Path());
- }
- return;
- }
-
/* Event-handling functions */
virtual void MessageReceived(BMessage *message)
{
@@ -170,7 +164,7 @@ class SDL_BApp : public BApplication
break;
default:
- BApplication::MessageReceived(message);
+ BLooper::MessageReceived(message);
break;
}
}
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index 54645ee..ed1b961 100644
--- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h
@@ -125,8 +125,8 @@ class SDL_BWin : public BWindow
#if SDL_VIDEO_OPENGL
if (_SDL_GLView) {
- if (((SDL_BApp *)be_app)->GetCurrentContext() == _SDL_GLView)
- ((SDL_BApp *)be_app)->SetCurrentContext(NULL);
+ if (SDL_Looper->GetCurrentContext() == _SDL_GLView)
+ SDL_Looper->SetCurrentContext(NULL);
if (_SDL_GLView == _cur_view)
RemoveChild(_SDL_GLView);
_SDL_GLView = NULL;
@@ -209,8 +209,8 @@ class SDL_BWin : public BWindow
{
Lock();
if (_SDL_GLView != NULL) {
- if (((SDL_BApp *)be_app)->GetCurrentContext() == _SDL_GLView)
- ((SDL_BApp *)be_app)->SetCurrentContext(NULL);
+ if (SDL_Looper->GetCurrentContext() == _SDL_GLView)
+ SDL_Looper->SetCurrentContext(NULL);
_SDL_GLView = NULL;
UpdateCurrentView();
// _SDL_GLView deleted by HAIKU_GL_DeleteContext
@@ -572,7 +572,7 @@ class SDL_BWin : public BWindow
if (keyUtf8 != NULL) {
msg.AddData("key-utf8", B_INT8_TYPE, (const void *)keyUtf8, len);
}
- be_app->PostMessage(&msg);
+ SDL_Looper->PostMessage(&msg);
}
void _RepaintEvent()
@@ -584,7 +584,7 @@ class SDL_BWin : public BWindow
void _PostWindowEvent(BMessage &msg)
{
msg.AddInt32("window-id", _id);
- be_app->PostMessage(&msg);
+ SDL_Looper->PostMessage(&msg);
}
/* Command methods (functions called upon by SDL) */
diff --git a/src/video/haiku/SDL_bframebuffer.cc b/src/video/haiku/SDL_bframebuffer.cc
index c508af7..2cb4f64 100644
--- a/src/video/haiku/SDL_bframebuffer.cc
+++ b/src/video/haiku/SDL_bframebuffer.cc
@@ -39,8 +39,8 @@ static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return (SDL_BWin *)(window->driverdata);
}
-static SDL_INLINE SDL_BApp *_GetBeApp() {
- return (SDL_BApp *)be_app;
+static SDL_INLINE SDL_BLooper *_GetBeLooper() {
+ return SDL_Looper;
}
int HAIKU_CreateWindowFramebuffer(_THIS, SDL_Window * window,
diff --git a/src/video/haiku/SDL_bmessagebox.cc b/src/video/haiku/SDL_bmessagebox.cc
index ed9dfc4..2983ef3 100644
--- a/src/video/haiku/SDL_bmessagebox.cc
+++ b/src/video/haiku/SDL_bmessagebox.cc
@@ -358,7 +358,7 @@ HAIKU_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
// "2 BApplication objects were created. Only one is allowed."
BApplication *application = NULL;
if (be_app == NULL) {
- application = new(std::nothrow) BApplication(signature);
+ application = new(std::nothrow) BApplication(SDL_signature);
if (application == NULL) {
return SDL_SetError("Cannot create the BApplication object. Lack of memory?");
}
diff --git a/src/video/haiku/SDL_bmodes.cc b/src/video/haiku/SDL_bmodes.cc
index cb8f852..eb8f153 100644
--- a/src/video/haiku/SDL_bmodes.cc
+++ b/src/video/haiku/SDL_bmodes.cc
@@ -52,8 +52,8 @@ static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return (SDL_BWin *)(window->driverdata);
}
-static SDL_INLINE SDL_BApp *_GetBeApp() {
- return (SDL_BApp *)be_app;
+static SDL_INLINE SDL_BLooper *_GetBeLooper() {
+ return SDL_Looper;
}
static SDL_INLINE display_mode * _ExtractBMode(SDL_DisplayMode *mode) {
diff --git a/src/video/haiku/SDL_bopengl.cc b/src/video/haiku/SDL_bopengl.cc
index 9dc76e9..7e12ad6 100644
--- a/src/video/haiku/SDL_bopengl.cc
+++ b/src/video/haiku/SDL_bopengl.cc
@@ -39,8 +39,8 @@ static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return (SDL_BWin *)(window->driverdata);
}
-static SDL_INLINE SDL_BApp *_GetBeApp() {
- return (SDL_BApp *)be_app;
+static SDL_INLINE SDL_BLooper *_GetBeLooper() {
+ return SDL_Looper;
}
/* Passing a NULL path means load pointers from the application */
@@ -97,7 +97,7 @@ int HAIKU_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) {
return SDL_SetError("MakeCurrent failed");
}
}
- _GetBeApp()->SetCurrentContext(glView);
+ _GetBeLooper()->SetCurrentContext(glView);
return 0;
}
@@ -138,7 +138,7 @@ SDL_GLContext HAIKU_GL_CreateContext(_THIS, SDL_Window * window) {
}
#endif
bwin->CreateGLView(gl_flags);
- _GetBeApp()->SetCurrentContext(bwin->GetGLView());
+ _GetBeLooper()->SetCurrentContext(bwin->GetGLView());
return (SDL_GLContext)(bwin->GetGLView());
}
diff --git a/src/video/haiku/SDL_bwindow.cc b/src/video/haiku/SDL_bwindow.cc
index bbf9336..18e03d4 100644
--- a/src/video/haiku/SDL_bwindow.cc
+++ b/src/video/haiku/SDL_bwindow.cc
@@ -37,8 +37,8 @@ static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return (SDL_BWin *)(window->driverdata);
}
-static SDL_INLINE SDL_BApp *_GetBeApp() {
- return (SDL_BApp *)be_app;
+static SDL_INLINE SDL_BLooper *_GetBeLooper() {
+ return SDL_Looper;
}
static int _InitWindow(_THIS, SDL_Window *window) {
@@ -72,7 +72,7 @@ static int _InitWindow(_THIS, SDL_Window *window) {
}
window->driverdata = bwin;
- int32 winID = _GetBeApp()->GetID(window);
+ int32 winID = _GetBeLooper()->GetID(window);
bwin->SetID(winID);
return 0;
@@ -220,7 +220,7 @@ void HAIKU_SetWindowMouseGrab(_THIS, SDL_Window * window, SDL_bool grabbed) {
void HAIKU_DestroyWindow(_THIS, SDL_Window * window) {
_ToBeWin(window)->LockLooper(); /* This MUST be locked */
- _GetBeApp()->ClearID(_ToBeWin(window));
+ _GetBeLooper()->ClearID(_ToBeWin(window));
_ToBeWin(window)->Quit();
window->driverdata = NULL;
}