[haiku-gsoc] SDL Patch 01
- From: Nathan Heisey <nathanheisey@xxxxxxxxx>
- To: haiku-gsoc <haiku-gsoc@xxxxxxxxxxxxx>
- Date: Mon, 27 Jun 2011 02:27:48 +0000
Hello all,
Attached is the most recent patch.
The next patch will probably take quite a while, since I plan on
restructuring some of the existing implementation and adding new
features to account for the new SDL 1.3 device structure, as well as
make it more comparable to the other supported systems.
-Nathan Heisey
# HG changeset patch
# User Nathan Heisey <nathanheisey@xxxxxxxxx>
# Date 1308919723 0
# Node ID af3e8e1f14e3a5b2dd4d5cbdfae25e1a9444bbab
# Parent 6b524fc4861a3d6f81a256381d7e2a78b9cce0ce
Replaced private event functionality with event sending.
diff -r 6b524fc4861a -r af3e8e1f14e3 src/video/bwindow/SDL_BWin.h
--- a/src/video/bwindow/SDL_BWin.h Tue Jun 21 13:49:14 2011 +0000
+++ b/src/video/bwindow/SDL_BWin.h Fri Jun 24 12:48:43 2011 +0000
@@ -33,6 +33,9 @@
#endif
#include <support/UTF8.h>
+//FIXME: Temporary fix until I can understand what the values used from here do
+#include "SDL_compat.h"
+
#include "../../main/beos/SDL_BeApp.h"
#include "SDL_events.h"
#include "SDL_BView.h"
@@ -219,7 +222,8 @@
if (inhibit_resize)
inhibit_resize = false;
else
- SDL_PrivateResize((int) width, (int) height);
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED,
+ (int) width, (int) height);
}
virtual int CreateView(Uint32 flags, Uint32 gl_flags)
{
@@ -227,7 +231,7 @@
retval = 0;
Lock();
- if (flags & SDL_INTERNALOPENGL) {
+ if (flags & SDL_OPENGL/*SDL_INTERNALOPENGL*/) {
#if SDL_VIDEO_OPENGL
if (SDL_GLView == NULL) {
SDL_GLView = new BGLView(Bounds(), "SDL GLView",
@@ -321,17 +325,24 @@
virtual void Minimize(bool minimize)
{
/* This is only called when mimimized, not when restored */
- //SDL_PrivateAppActive(minimize, SDL_APPACTIVE);
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
BWindow::Minimize(minimize);
}
virtual void WindowActivated(bool active)
{
- SDL_PrivateAppActive(active, SDL_APPINPUTFOCUS);
+// SDL_PrivateAppActive(active, SDL_APPINPUTFOCUS);
+ if( active ) {
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+ } else {
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+ }
}
virtual bool QuitRequested(void)
{
if (SDL_BeAppActive > 0) {
- SDL_PrivateQuit();
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_CLOSE, 0, 0);
/* We don't ever actually close the window here because
the application should respond to the quit request,
or ignore it as desired.
@@ -401,19 +412,23 @@
&& msg->FindInt32("be:transit", &transit) == B_OK) {
if (transit == B_EXITED_VIEW) {
if (SDL_GetAppState() & SDL_APPMOUSEFOCUS) {
- SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+// SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ SDL_SendWindowEvent(window,
SDL_WINDOWEVENT_HIDDEN, 0, 0);
+ SDL_SendWindowEvent(window,
SDL_WINDOWEVENT_MINIMIZED, 0, 0);
be_app->SetCursor(B_HAND_CURSOR);
}
} else {
int x, y;
if (!(SDL_GetAppState() & SDL_APPMOUSEFOCUS)) {
- SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+// SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SHOWN,
0, 0);
+ SDL_SendWindowEvent(window,
SDL_WINDOWEVENT_RESTORED, 0, 0);
SDL_SetCursor(NULL);
}
GetXYOffset(x, y);
x = (int) where.x - x;
y = (int) where.y - y;
- SDL_PrivateMouseMotion(0, 0, x, y);
+ SDL_SendMouseMotion(window, 0, x, y);
}
}
break;
@@ -424,19 +439,21 @@
/* it looks like mouse down is send only for first clicked
button, each next is not send while last one is holded */
int32 buttons;
- int sdl_buttons = 0;
+// int sdl_buttons = 0;
if (msg->FindInt32("buttons", &buttons) == B_OK) {
/* Add any mouse button events */
if (buttons & B_PRIMARY_MOUSE_BUTTON) {
- sdl_buttons |= SDL_BUTTON_LEFT;
+// sdl_buttons |= SDL_BUTTON_LMASK;
+ SDL_SendMouseButton(window, SDL_PRESSED,
SDL_BUTTON_LEFT);
}
if (buttons & B_SECONDARY_MOUSE_BUTTON) {
- sdl_buttons |= SDL_BUTTON_RIGHT;
+// sdl_buttons |= SDL_BUTTON_RMASK;
+ SDL_SendMouseButton(window, SDL_PRESSED,
SDL_BUTTON_RIGHT);
}
if (buttons & B_TERTIARY_MOUSE_BUTTON) {
- sdl_buttons |= SDL_BUTTON_MIDDLE;
+// sdl_buttons |= SDL_BUTTON_MMASK;
+ SDL_SendMouseButton(window, SDL_PRESSED,
SDL_BUTTON_MIDDLE);
}
- SDL_PrivateMouseButton(SDL_PRESSED, sdl_buttons, 0, 0);
last_buttons = buttons;
}
@@ -455,19 +472,21 @@
without releasing previous one first) - but that's probably
because of how drivers are written?, not BeOS itself. */
int32 buttons;
- int sdl_buttons = 0;
+// int sdl_buttons = 0;
if (msg->FindInt32("buttons", &buttons) == B_OK) {
/* Add any mouse button events */
if ((buttons ^ B_PRIMARY_MOUSE_BUTTON) & last_buttons) {
- sdl_buttons |= SDL_BUTTON_LEFT;
+// sdl_buttons |= SDL_BUTTON_LMASK;
+ SDL_SendMouseButton(window, SDL_RELEASED,
SDL_BUTTON_LEFT);
}
if ((buttons ^ B_SECONDARY_MOUSE_BUTTON) & last_buttons) {
- sdl_buttons |= SDL_BUTTON_RIGHT;
+// sdl_buttons |= SDL_BUTTON_RMASK;
+ SDL_SendMouseButton(window, SDL_RELEASED,
SDL_BUTTON_RIGHT);
}
if ((buttons ^ B_TERTIARY_MOUSE_BUTTON) & last_buttons) {
- sdl_buttons |= SDL_BUTTON_MIDDLE;
+// sdl_buttons |= SDL_BUTTON_MMASK;
+ SDL_SendMouseButton(window, SDL_RELEASED,
SDL_BUTTON_MIDDLE);
}
- SDL_PrivateMouseButton(SDL_RELEASED, sdl_buttons, 0, 0);
last_buttons = buttons;
}
@@ -481,15 +500,9 @@
if (msg->FindFloat("be:wheel_delta_x", &x) == B_OK
&& msg->FindFloat("be:wheel_delta_y", &y) == B_OK) {
if (x < 0 || y < 0) {
- SDL_PrivateMouseButton(SDL_PRESSED,
- SDL_BUTTON_WHEELDOWN, 0, 0);
- SDL_PrivateMouseButton(SDL_RELEASED,
- SDL_BUTTON_WHEELDOWN, 0, 0);
+ SDL_SendMouseWheel(window, (int)x, (int)y);
} else if (x > 0 || y > 0) {
- SDL_PrivateMouseButton(SDL_PRESSED,
- SDL_BUTTON_WHEELUP, 0, 0);
- SDL_PrivateMouseButton(SDL_RELEASED,
- SDL_BUTTON_WHEELUP, 0, 0);
+ SDL_SendMouseWheel(window, (int)x, (int)y);
}
}
break;
@@ -509,7 +522,7 @@
if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
SDL_Keysym keysym;
- keysym.scancode = key;
+ keysym.scancode = (SDL_Scancode)key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
} else {
@@ -520,6 +533,7 @@
anyway, and doesn't care about what we setup here */
keysym.mod = KMOD_NONE;
keysym.unicode = 0;
+#if 0 /* FIXME: As far as I can make out, this isn't really used anymore? */
if (SDL_TranslateUNICODE) {
const char *bytes;
if (msg->FindString("bytes", &bytes) == B_OK) {
@@ -530,7 +544,8 @@
keysym.unicode = Translate2Unicode(bytes);
}
}
- SDL_PrivateKeyboard(SDL_PRESSED, &keysym);
+#endif
+ SDL_SendKeyboardKey(SDL_PRESSED, keysym.scancode);
}
break;
}
@@ -543,7 +558,7 @@
if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
SDL_Keysym keysym;
- keysym.scancode = key;
+ keysym.scancode = (SDL_Scancode)key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
} else {
@@ -551,13 +566,15 @@
}
keysym.mod = KMOD_NONE; /* FIX THIS? */
keysym.unicode = 0;
+#if 0 /* FIXME: As far as I can make out, this isn't really used anymore? */
if (SDL_TranslateUNICODE) {
const char *bytes;
if (msg->FindString("bytes", &bytes) == B_OK) {
keysym.unicode = Translate2Unicode(bytes);
}
}
- SDL_PrivateKeyboard(SDL_RELEASED, &keysym);
+#endif
+ SDL_SendKeyboardKey(SDL_RELEASED, keysym.scancode);
}
break;
}
@@ -586,6 +603,8 @@
int32 last_buttons;
SDL_Keycode keymap[128];
+
+ SDL_Window *window;
};
#endif /* _SDL_BWin_h */
diff -r 6b524fc4861a -r af3e8e1f14e3 src/video/bwindow/SDL_lowvideo.h
--- a/src/video/bwindow/SDL_lowvideo.h Tue Jun 21 13:49:14 2011 +0000
+++ b/src/video/bwindow/SDL_lowvideo.h Fri Jun 24 12:48:43 2011 +0000
@@ -43,7 +43,7 @@
SDL_Rect **SDL_modelist[NUM_MODELISTS];
/* A completely clear cursor */
- WMcursor *BlankCursor;
+ struct WMcursor *BlankCursor;
SDL_Overlay *overlay;
};
diff -r 6b524fc4861a -r af3e8e1f14e3 src/video/bwindow/SDL_sysvideo.cc
--- a/src/video/bwindow/SDL_sysvideo.cc Tue Jun 21 13:49:14 2011 +0000
+++ b/src/video/bwindow/SDL_sysvideo.cc Fri Jun 24 12:48:43 2011 +0000
@@ -549,7 +549,10 @@
current->flags |= SDL_NOFRAME;
SDL_Win->SetLook(B_NO_BORDER_WINDOW_LOOK);
} else {
- if ((flags & SDL_RESIZABLE) && !(flags & SDL_INTERNALOPENGL)) {
+ /* FIXME: What was SDL_INTERNALOPENGL? This used it before, but
it
+ isn't defined anywhere. */
+ if ((flags & SDL_RESIZABLE) && !(flags & SDL_OPENGL
+ /*SDL_INTERNALOPENGL*/)) {
current->flags |= SDL_RESIZABLE;
/* We don't want opaque resizing (TM). :-) */
SDL_Win->SetFlags(B_OUTLINE_RESIZE);
@@ -558,8 +561,8 @@
}
}
- if (flags & SDL_INTERNALOPENGL) {
- current->flags |= SDL_INTERNALOPENGL;
+ if (flags & SDL_OPENGL /*SDL_INTERNALOPENGL*/) {
+ current->flags |= SDL_OPENGL /*SDL_INTERNALOPENGL*/;
current->pitch = 0;
current->pixels = NULL;
_this->UpdateRects = NULL;
exporting patch:
<fdopen>
Other related posts:
