Commit graph

6707 commits

Author SHA1 Message Date
Jørgen P. Tjernø
d17c440442 Add SDL_GL_ResetAttributes.
--HG--
extra : rebase_source : 0a6fd1c977ab93ba651adaae3fa5a71d7c69fa8e
2014-01-29 18:38:13 -08:00
Sam Lantinga
a09aac7720 Add a new hint SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT that allows SDL_CreateWindowFrom() to set the pixel format of another SDL_Window (and also will set the SDL_WINDOW_OPENGL flag on the window created with SDL_CreateWindowFrom()).
The reasoning behind this change is that source2 in -tools mode has a single OpenGL context that is used with multiple different windows.  Some of those windows are created outside the engine (i.e. with Qt) and therefore we need to use SDL_CreateWindowFrom() to get an SDL_Window for those.  The requirement for sharing an OpenGL context across multiple different windows is that each window has the same pixel format.  To facilitate this, I now set SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT for the main window before calling SDL_CreateWindowFrom().  When I do this, SDL_CreateWindowFrom() will:

1. Set the pixel format of the returned window to the same pixel format as this SDL_Window passed in with the hint
2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for OpenGL rendering.

I only currently implemented this for Win32/WGL so implementing it for other platforms (i.e. X11) remains a TODO.

CR: SamL

Some pseudocode that shows how this is used in Source2:

HWND hExternalHwnd; // HWND that was established outside of SDL

// Create main window (happens inside platwindow.cpp)
SDL_Window *mainWindow = SDL_CreateWindow( , SDL_WINDOW_OPENGL .. );
// Create GL context, happens inside rendersystemgl
SDL_GLContext onlyContext = SDL_GL_CreateContext( mainWindow );

// Now I need to create another window from hEternalHwnd for my swap chain that will have the same pixel format as mainWindow, so set the hint
SDL_SetHint( SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT, CFmtStr( %p, mainWindow) );

// Create the secondary window.  This returned window will have SDL_WINDOW_OPENGL set and share a pixel format with mainWindow from the hint
SDL_Window *secondaryWindow = SDL_CreateWindowFrom( hExternalHwnd );

// To render to the main window:
SDL_GL_MakeCurrent( mainWindow, onlyContext );
// Do some rendering to main window

// To render to the secondary window:
SDL_GLMakeCurrent( secondaryWindow, onlyContext );
// Do some rendering to secondary window
2014-01-30 12:30:40 -08:00
Sam Lantinga
d9f1c7b666 Document Michael's changes adding TranslateMessage() back to the SDL message loop. 2014-01-30 12:27:24 -08:00
Sam Lantinga
ff4616a9f6 * Added TranslateMessage call to SDL default message pump - was causing problems in S2 tools mode apps that used Qt. Qt relies on the WM_CHAR message generated by TranslateMessage and keyboard input was showing up in the UI as mixed-case. (Depending on which message pump got a given message - both SDL and Qt pump messages for the entire process.) Sam will review and possibly tweak this change before propagating to public SDL, but I'm checking this version in so I can integrate into S2 and fix the issue there. 2014-01-30 12:27:00 -08:00
Jørgen P. Tjernø
fa2b1bca37 Mac: [NSApp keyWindow] is not valid in windowDidBecomeKey:
This fixes weird behavior on Mac where our first responder reverts to the window
itself, rather than the SDLTranslatorResponder, after the window has lost focus
once. This causes Escape to call cancelOperation: on the NSWindow, which by
default removes our fullscreen-ness.

When someone has turned off SDL_TEXTINPUT we should probably set another initial
responder that handles the Escape behavior, so that SDL_TEXTINPUT doesn't change
fullscreen behavior (and possibly other behavior) like it does now.

--HG--
extra : rebase_source : df8cb6520810c2174f4960c263840b0ed47a757c
2014-01-29 18:37:23 -08:00
dbrady
e2653cfbe5 fixed hat code validation. 2014-01-28 15:28:20 -08:00
Philipp Wiesemann
4900721db6 Fixed spaces in source file license comment. 2014-01-29 00:29:14 +01:00
Philipp Wiesemann
d66561a66d Fixed comments in joystick implementation files claiming to be headers.
It seems comments were originally copied from SDL_sysjoystick.h.
2014-01-29 00:27:54 +01:00
Ryan C. Gordon
3d3ea1fac8 Move to no-argument version of "endif()" in CMakeLists.txt.
--HG--
extra : rebase_source : 92449842241a87a56281cbffbbdece5a882ed11d
2014-01-28 12:42:01 -05:00
Ryan C. Gordon
e5d21117a7 Some CMake fixes for static linking on Windows from the OpenFL project.
--HG--
extra : rebase_source : d913d06e39a873fa6da7814786f1acf49e541c7f
2014-01-28 12:37:04 -05:00
Gabriel Jacobo
299247a5ed [Wayland] Fixes segfault when mouse enters window 2014-01-28 11:39:37 -03:00
Gabriel Jacobo
69734c6913 Preserve binary compatibility in SDL_SYSWM_TYPE (thanks Gerry JJ!)
Also moved Wayland structures to the bottom of the union for OCD related issues.
2014-01-28 09:13:46 -03:00
Ryan C. Gordon
8c8c5cd844 CMake: Enable missing timer subsystem on Mac OS X and Haiku. 2014-01-28 00:05:23 -05:00
Jørgen P. Tjernø
0b00b27fc8 X11: Don't redraw dialog box when mouse moves.
This fixes bug #2343. (https://bugzilla.libsdl.org/show_bug.cgi?id=2343)

Thanks to Melker Narikka for the patch.
2014-01-27 13:43:04 -08:00
Ryan C. Gordon
24aaf535bc Patched to compile...uh, everywhere. :) 2014-01-27 16:13:13 -05:00
Ryan C. Gordon
452acbeeab Patched to compile on Windows when not supporting Direct3D. 2014-01-27 16:10:15 -05:00
Gabriel Jacobo
b878543be3 [Android] Fixes Bug 2370, don't send accelerometer changes when
Android_JNI_GetAccelerometerValues return SDL_FALSE (thanks to Jairo Luiz)
2014-01-27 17:59:19 -03:00
Philipp Wiesemann
60e32d1ffc Removed unused variable from Java class for Android.
The audio thread was moved to native side and "protected" prevented a warning.
2014-01-26 23:50:35 +01:00
Philipp Wiesemann
bceb05d311 Fixed typo in documentation. 2014-01-26 23:42:25 +01:00
Edward Rudd
90f139dcb9 quick fix for CMAKE SOVERSION number so it matches what is output by the configure script 2014-01-25 16:08:39 -05:00
Edward Rudd
c71a62043d correct grammar on UNIX missing dependency status notice.
--HG--
extra : amend_source : 5deffcdb01ff5358a9b62d6d2f473012c66544ff
2014-01-25 15:13:16 -05:00
Edward Rudd
e43ad531ae autoconf script tweaks
- fix up chmodding sdl2-config
- remove duplicate enable_atomic section
- add pretty summary of what was found/enabled
2014-01-25 15:05:44 -05:00
Gabriel Jacobo
037b44fc19 Bug 2358 - [Android] Sort joystick axes - Fix by David Brady 2014-01-24 09:54:04 -03:00
Gabriel Jacobo
196de652c5 Bug 2358 - [Android] Joystick Button Mappings are strange (fix by David Brady) 2014-01-23 08:44:25 -03:00
Ryan C. Gordon
e1cd175738 Fix detection of iOS for disabling dynamic API. 2014-01-22 12:39:34 -05:00
Ryan C. Gordon
e83b3337a8 Fixed XF86 VidMode extension dynamic loading with CMake project.
--HG--
extra : rebase_source : ade5d676aa8087b8ad54462e9d9569985fd8c66e
2014-01-21 16:28:53 -05:00
Gabriel Jacobo
3ae02c72db Fixes 2356, [Android] SDL_JoystickGetAttached does not function
Also fix a potential NULL pointer access in android/SDL_SYS_JoystickGetGUID

--HG--
extra : source : 215d88851d3a51422efeb30d50476e8b34337a95
2014-01-21 18:20:12 -03:00
Ryan C. Gordon
723a653107 Fixed dynamic loading of NAS in CMake project. 2014-01-21 13:58:15 -05:00
Gabriel Jacobo
22d076b16f Move Wayland driver above dummy, check for driver availability before creation 2014-01-20 20:25:43 -03:00
Ryan C. Gordon
831ef8c592 Patched to compile if Wayland is disabled via SDL_config.h (thanks, Martin!).
Fixes Bugzilla #2351.
2014-01-20 12:53:44 -05:00
Sam Lantinga
b1e60f303c Make sure you clean up the associated renderer when destroying a window. 2014-01-18 11:47:03 -08:00
Gabriel Jacobo
836efb4c3e Fixes prototype declaration for wl_proxy_marshal_constructor [Wayland 1.4] 2014-01-16 15:02:41 -03:00
Gabriel Jacobo
f6e748c3a9 Fix to compile against the Wayland v1.4 headers 2014-01-16 11:33:39 -03:00
Jørgen P. Tjernø
4cb3bff047 Don't minimize fullscreen windows when destroying them.
Previously, we'd minimize fullscreen windows (if
SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS was set) during SDL_DestroyWindow if they
had keyboard focus, because we call SDL_SetKeyboardFocus(NULL) which yields a
OnWindowsFocusLost event.

Related to https://bugzilla.libsdl.org/show_bug.cgi?id=1840

--HG--
extra : histedit_source : 79338e62e43f2514a843aac8b62afa3e50c3fd5c
2014-01-15 11:34:03 -08:00
Jørgen P. Tjernø
f93c2e774a Mac: Don't give windows focus back when we're closing them.
Fixes bug #1840 (https://bugzilla.libsdl.org/show_bug.cgi?id=1840)

--HG--
extra : histedit_source : bd88f90110eb00ed9572073f7cc39a53e22a5d1b
2014-01-15 11:31:56 -08:00
Jørgen P. Tjernø
fcd0b2efc3 Allow switching between FS and desktop FS.
This should fix bug #2057 (https://bugzilla.libsdl.org/show_bug.cgi?id=2057)

--HG--
extra : histedit_source : 831e19a46dc0f4fe2e37c0cf0685c98706bada3c%2C9f25529300b5784d3b0574a060366c1625da11f1
2014-01-15 11:17:09 -08:00
Jørgen P. Tjernø
38a50a1236 Test: Add Shift-Enter to switch between FS and desktop FS. 2014-01-15 11:08:55 -08:00
Jørgen P. Tjernø
ff68a1209b Tests: Refactor key modifier checking.
--HG--
extra : histedit_source : 97ec656c66fe1197d537484335ee7a0926ee5728%2C6b85a2c4eb34fd410c7a0549a065ad6b44a746bd
2014-01-15 10:40:14 -08:00
Gabriel Jacobo
bebef1cd46 Adds README-dynapi.txt based on Ryan's G+ post (lightly edited)
Original post: https://plus.google.com/103391075724026391227/posts/TB8UfnDYu4U
2014-01-15 12:29:17 -03:00
Jørgen P. Tjernø
406ae45a58 Mac: Trigger SDL_FINGERUP for all touches.
Fixes bug #2348. Thanks to Alex Szpakowski for the patch!
2014-01-14 17:33:24 -08:00
Gabriel Jacobo
305b4e4afe Make EGL loading more resilient.
Lesson learned while trying to run L4D2 under Wayland :)
2014-01-14 21:29:38 -03:00
Gabriel Jacobo
774a9eed75 Dynamic loading support for Wayland 2014-01-09 13:56:21 -03:00
Edward Rudd
c8634f0d7f define a font-size for the "unicode" message box font so the text isn't unreadable on linux systems 2014-01-08 14:53:08 -05:00
Edward Rudd
80089de1b0 some fixes to the testshape.c code so it more correctly works.
--HG--
extra : rebase_source : 16e302aa18fca6d543bcefa99768a665385fa208
extra : amend_source : 5b2210968e25d6ff3851e1884de6109740fdddd1
2014-01-08 14:18:11 -05:00
Ryan C. Gordon
ac00407bd2 Maybe fix Cygwin. 2014-01-08 01:07:57 -05:00
Ryan C. Gordon
1314bfaf4a Patched to compile on Cygwin. 2014-01-08 00:58:03 -05:00
Ryan C. Gordon
bd68319d23 Another Android fix. 2014-01-08 00:51:31 -05:00
Ryan C. Gordon
9340a4d2f0 Updated Dynamic API jumptable. 2014-01-08 00:46:39 -05:00
Ryan C. Gordon
b77f9fd47c Add Dynamic API to Android makefile. 2014-01-08 00:45:29 -05:00
Ryan C. Gordon
599df6540c Patched to compile on Android (I think). 2014-01-08 00:40:48 -05:00